Merge "Fix error in qtip job template"

[releng.git] / jjb / storperf / storperf.yml

diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml
index 1a2eb5e..f675cbb 100644 (file)
--- a/jjb/storperf/storperf.yml
+++ b/jjb/storperf/storperf.yml
@@ -13,10 +13,12 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+            docker-tag: 'latest'
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false
+            docker-tag: 'stable'
 
 - job-template:
     name: 'storperf-verify-{stream}'
@@ -28,7 +30,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_BASE
@@ -80,6 +81,7 @@
                     healthy: 50
                     unhealthy: 40
                     failing: 30
+        - email-jenkins-admins-on-failure
 
 - job-template:
     name: 'storperf-merge-{stream}'
@@ -89,8 +91,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -135,6 +136,7 @@
                     healthy: 50
                     unhealthy: 40
                     failing: 30
+        - email-jenkins-admins-on-failure
 
 - job-template:
     name: 'storperf-daily-{stream}'
@@ -144,21 +146,64 @@
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: opnfv-build-ubuntu
-
-    disabled: true
+    disabled: '{obj:disabled}'
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
+        - 'intel-pod9-defaults'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-nosdn-nofeature-noha'
+        - string:
+            name: DOCKER_TAG
+            default: '{docker-tag}'
+            description: 'Tag to pull docker image'
+        - choice:
+            name: DISK_TYPE
+            choices:
+                - 'SSD'
+                - 'HDD'
+            default: 'HDD'
+            description: 'The type of hard disk that Cinder uses'
+        - string:
+            name: AGENT_COUNT
+            description: 'The number of slave agents to start. Defaults to the cinder node count'
+        - string:
+            name: VOLUME_SIZE
+            default: '4'
+            description: 'Size of Cinder volume (in GB)'
+        - string:
+            name: WORKLOADS
+            default: 'wr,rr,rw'
+            description: 'Workloads to run'
+        - string:
+            name: BLOCK_SIZES
+            default: '2048,16384'
+            description: 'Block sizes for VM I/O operations'
+        - string:
+            name: QUEUE_DEPTHS
+            default: '1,4'
+            description: 'Number of simultaneous I/O operations to keep active'
+        - string:
+            name: STEADY_STATE_SAMPLES
+            default: '10'
+            description: 'Number of samples to use (1 per minute) to measure steady state'
+        - string:
+            name: DEADLINE
+            description: 'Maximum run time in minutes if steady state cannot be found. Defaults to 3 times steady state samples'
+        - choice:
+            name: TEST_CASE
+            choices:
+                - 'snia_steady_state'
+            description: 'The test case to run'
 
     scm:
         - git-scm
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '0 22 * * *'
 
     builders:
         - shell: |