X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fstorperf%2Fstorperf.yml;h=626c5c3327087e55dcc43214d1537d39c3fef96e;hb=0a912f7e971082012563150933456fac209049a4;hp=1a2eb5e31a1f5e10d220664f7b0d961a3b8843b7;hpb=92e6e549dcab1777ebcc7c888e99c52f0dfdf433;p=releng.git

diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml
index 1a2eb5e31..626c5c332 100644
--- 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
-        - colorado:
+            docker-tag: 'latest'
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false
+            docker-tag: 'stable'
 
 - job-template:
     name: 'storperf-verify-{stream}'
@@ -28,7 +29,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_BASE
@@ -80,6 +80,7 @@
                     healthy: 50
                     unhealthy: 40
                     failing: 30
+        - email-jenkins-admins-on-failure
 
 - job-template:
     name: 'storperf-merge-{stream}'
@@ -89,8 +90,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -135,32 +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)
-    node: opnfv-build-ubuntu
-
-    disabled: true
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-
-    scm:
-        - git-scm
-
-    triggers:
-        - timed: 'H H * * *'
-
-    builders:
-        - shell: |
-            $WORKSPACE/ci/daily.sh
+        - email-jenkins-admins-on-failure