From 7b5a83225254840a2f27e3b38746b4e4d34fc4bd Mon Sep 17 00:00:00 2001 From: Dimitri Mazmanov Date: Tue, 31 Jan 2017 11:36:15 +0100 Subject: [PATCH] Fix absolute paths for the scripts The run.sh configuration script uses relative paths for the remote runnables. Change-Id: Ia45c748840e161263df9d76387992e8c23daf93e Signed-off-by: Dimitri Mazmanov --- jjb/multisite/multisite-daily-jobs.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/jjb/multisite/multisite-daily-jobs.yml b/jjb/multisite/multisite-daily-jobs.yml index 15c885de4..f2b287169 100644 --- a/jjb/multisite/multisite-daily-jobs.yml +++ b/jjb/multisite/multisite-daily-jobs.yml @@ -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: -- 2.16.6