diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-02-13 13:28:55 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-02-13 13:28:55 -0500 |
| commit | 7dea87d60b4cc5184b81923dd71ac4d0fcad74ef (patch) | |
| tree | 9944a23d6f7e497a93311a5912d970a95cc05564 | |
| parent | f7b49fbb7b2ac882a14309f8719ce4a0f8dbe15d (diff) | |
CSIT: Fixes credential file passing
Change-Id: I1605452d5ad4e61915e537677fc291f911dfb6e8
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rw-r--r-- | jjb/3rd_party_ci/odl-netvirt.yml | 2 | ||||
| -rwxr-xr-x | 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 |