Fix absolute paths for the scripts 77/27777/2
authorDimitri Mazmanov <dimitri.mazmanov@ericsson.com>
Tue, 31 Jan 2017 10:36:15 +0000 (11:36 +0100)
committerDimitri Mazmanov <dimitri.mazmanov@ericsson.com>
Tue, 31 Jan 2017 10:41:20 +0000 (11:41 +0100)
The run.sh configuration script uses relative paths for the remote
runnables.

Change-Id: Ia45c748840e161263df9d76387992e8c23daf93e
Signed-off-by: Dimitri Mazmanov <dimitri.mazmanov@ericsson.com>
jjb/multisite/multisite-daily-jobs.yml

index 15c885d..f2b2871 100644 (file)
             !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'
             #!/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:
             #!/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:
             #!/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: