X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fmultisite%2Fmultisite-daily-jobs.yml;h=c5e1866e3f81cc7af81390e8e08cff49401ec936;hb=8925258ec526ebd0828bc985c13ecfa4bb533601;hp=f2b287169597ca7e23ab3cf9292355c10b8bed32;hpb=a31fea270f18f6eac7f476c5b893dec85f872912;p=releng.git

diff --git a/jjb/multisite/multisite-daily-jobs.yml b/jjb/multisite/multisite-daily-jobs.yml
index f2b287169..c5e1866e3 100644
--- a/jjb/multisite/multisite-daily-jobs.yml
+++ b/jjb/multisite/multisite-daily-jobs.yml
@@ -24,7 +24,12 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-            timed: '#@midnight'
+            timed: '0 12 * * *'
+        - danube:
+            branch: 'stable/{stream}'
+            gs-pathname: '/{stream}'
+            disabled: false
+            timed: '0 0 * * *'
 
 - job-template:
     name: 'multisite-kingbird-virtual-daily-{stream}'
@@ -38,6 +43,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - choice:
             name: FRESH_INSTALL
             choices:
@@ -137,8 +143,8 @@
                 - name: 'functest-fuel-virtual-suite-{stream}'
                   current-parameters: false
                   predefined-parameters: |
-                    DEPLOY_SCENARIO='os-nosdn-multisite-noha'
-                    FUNCTEST_SUITE_NAME='multisite'
+                    DEPLOY_SCENARIO=os-nosdn-multisite-noha
+                    FUNCTEST_SUITE_NAME=multisite
                     OS_REGION=RegionOne
                     REGIONONE_IP=100.64.209.10
                     REGIONTWO_IP=100.64.209.11
@@ -161,11 +167,13 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - string:
             name: KINGBIRD_LOG_FILE
             default: $WORKSPACE/kingbird.log
-        - gerrit-parameter:
-            branch: '{branch}'
+        - string:
+            name: GS_PATH
+            default: 'http://artifacts.opnfv.org/fuel{gs-pathname}'
         - 'fuel-defaults'
         - '{slave-label}-defaults'
         - choice:
@@ -185,6 +193,7 @@
 
     publishers:
         - 'multisite-{phase}-publisher'
+        - email-jenkins-admins-on-failure
 
 ########################
 # builder macros
@@ -250,7 +259,8 @@
             #!/bin/bash
 
             echo "This is where we install kingbird"
-            $WORKSPACE/tools/kingbird/deploy.sh
+            cd $WORKSPACE/tools/kingbird
+            ./deploy.sh
 ########################
 # publisher macros
 ########################