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 a04a9f4..626c5c3 100644 (file)
--- a/jjb/storperf/storperf.yml
+++ b/jjb/storperf/storperf.yml
@@ -6,17 +6,18 @@
     jobs:
         - 'storperf-verify-{stream}'
         - 'storperf-merge-{stream}'
-        - 'storperf-daily-{stream}'
 
     stream:
         - master:
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
+            docker-tag: 'latest'
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
+            docker-tag: 'stable'
 
 - job-template:
     name: 'storperf-verify-{stream}'
@@ -79,6 +80,7 @@
                     healthy: 50
                     unhealthy: 40
                     failing: 30
+        - email-jenkins-admins-on-failure
 
 - job-template:
     name: 'storperf-merge-{stream}'
@@ -133,30 +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'
-
-    scm:
-        - git-scm
-
-    triggers:
-        - timed: 'H H * * *'
-
-    builders:
-        - shell: |
-            $WORKSPACE/ci/daily.sh
+        - email-jenkins-admins-on-failure