merge GIT_BRANCH and GERRIT_BRANCH into BRANCH

[releng.git] / jjb / multisite / multisite-daily-jobs.yml

diff --git a/jjb/multisite/multisite-daily-jobs.yml b/jjb/multisite/multisite-daily-jobs.yml
index 15c885d..6b022fd 100644 (file)
--- a/jjb/multisite/multisite-daily-jobs.yml
+++ b/jjb/multisite/multisite-daily-jobs.yml
@@ -24,7 +24,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-            timed: '#@midnight'
+            timed: '@midnight'
 
 - job-template:
     name: 'multisite-kingbird-virtual-daily-{stream}'
@@ -38,6 +38,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - choice:
             name: FRESH_INSTALL
             choices:
@@ -161,11 +162,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - string:
             name: KINGBIRD_LOG_FILE
             default: $WORKSPACE/kingbird.log
-        - gerrit-parameter:
-            branch: '{branch}'
         - 'fuel-defaults'
         - '{slave-label}-defaults'
         - choice:
@@ -196,8 +196,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 +211,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 +225,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 +239,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 +250,8 @@
             #!/bin/bash
 
             echo "This is where we install kingbird"
-            $WORKSPACE/tools/kingbird/deploy.sh
+            cd $WORKSPACE/tools/kingbird
+            ./deploy.sh
 ########################
 # publisher macros
 ########################