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

diff --git a/jjb/multisite/multisite-daily-jobs.yml b/jjb/multisite/multisite-daily-jobs.yml
index 15c885de4..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
@@ -196,8 +205,11 @@
             !include-raw-escape: ./fuel-deploy-for-multisite.sh
         - shell: |
             #!/bin/bash
+
             echo "This is where we deploy fuel, extract passwords and save into file"
-            $WORKSPACE/tools/keystone/run.sh -t controller -r $WORKSPACE/tools/keystone/fetchpass.sh -o servicepass.ini
+
+            cd $WORKSPACE/tools/keystone/
+            ./run.sh -t controller -r fetchpass.sh -o servicepass.ini
 
 - builder:
     name: 'multisite-fuel-deploy-regiontwo-virtual-builder'
@@ -208,7 +220,9 @@
             #!/bin/bash
 
             echo "This is where we deploy fuel, extract publicUrl, privateUrl, and adminUrl and save into file"
-            $WORKSPACE/tools/keystone/run.sh -t controller -r $WORKSPACE/tools/keystone/endpoint.sh -o endpoints.ini
+
+            cd $WORKSPACE/tools/keystone/
+            ./run.sh -t controller -r endpoint.sh -o endpoints.ini
 - builder:
     name: 'multisite-register-endpoints-builder'
     builders:
@@ -220,7 +234,9 @@
             #!/bin/bash
 
             echo "This is where we register RegionTwo in RegionOne keystone using endpoints.ini"
-            $WORKSPACE/tools/keystone/run.sh -t controller -r $WORKSPACE/tools/keystone/region.sh -d $WORKSPACE/endpoints.ini
+
+            cd $WORKSPACE/tools/keystone/
+            ./run.sh -t controller -r region.sh -d $WORKSPACE/endpoints.ini
 - builder:
     name: 'multisite-update-auth-builder'
     builders:
@@ -232,8 +248,10 @@
             #!/bin/bash
 
             echo "This is where we read passwords from servicepass.ini and replace passwords in RegionTwo"
-            $WORKSPACE/tools/keystone/run.sh -t controller -r $WORKSPACE/tools/keystone/writepass.sh -d $WORKSPACE/servicepass.ini
-            $WORKSPACE/tools/keystone/run.sh -t compute -r $WORKSPACE/tools/keystone/writepass.sh -d $WORKSPACE/servicepass.ini
+
+            cd $WORKSPACE/tools/keystone/
+            ./run.sh -t controller -r writepass.sh -d $WORKSPACE/servicepass.ini
+            ./run.sh -t compute -r writepass.sh -d $WORKSPACE/servicepass.ini
 - builder:
     name: 'multisite-kingbird-deploy-virtual-builder'
     builders:
@@ -241,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
 ########################