Merge "use Calipso verify.sh for easier control of verification"

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

diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml
index be53b27..626c5c3 100644 (file)
--- a/jjb/storperf/storperf.yml
+++ b/jjb/storperf/storperf.yml
@@ -6,7 +6,6 @@
     jobs:
         - 'storperf-verify-{stream}'
         - 'storperf-merge-{stream}'
-        - 'storperf-daily-{stream}'
 
     stream:
         - master:
@@ -81,6 +80,7 @@
                     healthy: 50
                     unhealthy: 40
                     failing: 30
+        - email-jenkins-admins-on-failure
 
 - job-template:
     name: 'storperf-merge-{stream}'
@@ -135,75 +135,5 @@
                     healthy: 50
                     unhealthy: 40
                     failing: 30
-
-- job-template:
-    name: 'storperf-daily-{stream}'
-
-    # Job template for daily builders
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-    disabled: '{obj:disabled}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-            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: '0 18 * * *'
-
-    builders:
-        - shell: |
-            $WORKSPACE/ci/daily.sh
+        - email-jenkins-admins-on-failure