From 7dea87d60b4cc5184b81923dd71ac4d0fcad74ef Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 13 Feb 2017 13:28:55 -0500 Subject: [PATCH] CSIT: Fixes credential file passing Change-Id: I1605452d5ad4e61915e537677fc291f911dfb6e8 Signed-off-by: Tim Rozet --- jjb/3rd_party_ci/odl-netvirt.yml | 2 +- jjb/functest/set-functest-env.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml index d070d0b37..dcc6ac17d 100644 --- a/jjb/3rd_party_ci/odl-netvirt.yml +++ b/jjb/3rd_party_ci/odl-netvirt.yml @@ -129,7 +129,7 @@ predefined-parameters: | DEPLOY_SCENARIO=os-odl_l3-nofeature-ha FUNCTEST_SUITE_NAME=healthcheck - RC_FILE_PATH=~/cloner-info/overcloudrc + RC_FILE_PATH=$HOME/cloner-info/overcloudrc node-parameters: true kill-phase-on: FAILURE abort-all-job: false diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index 5224793dc..abec480dc 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -14,8 +14,9 @@ if [[ ${INSTALLER_TYPE} == 'joid' ]]; then fi if [[ ${RC_FILE_PATH} != '' ]] && [[ -f ${RC_FILE_PATH} ]] ; then + echo "Credentials file detected: ${RC_FILE_PATH}" # volume if credentials file path is given to Functest - rc_file_vol="-v $RC_FILE_PATH:/home/opnfv/functest/conf/openstack.creds" + rc_file_vol="-v ${RC_FILE_PATH}:/home/opnfv/functest/conf/openstack.creds" fi -- 2.16.6