diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2017-07-14 07:32:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-14 07:32:39 +0000 |
| commit | 57acae96d4f574d3ba4a3f2d49faa972d13666d2 (patch) | |
| tree | 833436b89c06a0a24adc65d84e0536f501bf5fb5 /jjb | |
| parent | 70b7e9c3c80f50bfdc943b44cd2539c0e225db27 (diff) | |
| parent | 4b28f9ded3112aea214da186a9f3da4295b6f67b (diff) | |
Merge "Compass: add cacert file to enable SSL verification"
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/functest/set-functest-env.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index 5f936f5d9..72a9e1eda 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -9,6 +9,10 @@ set +o pipefail # Prepare OpenStack credentials volume if [[ ${INSTALLER_TYPE} == 'joid' ]]; then rc_file_vol="-v $LAB_CONFIG/admin-openrc:/home/opnfv/functest/conf/openstack.creds" +elif [[ ${INSTALLER_TYPE} == 'compass' && ${BRANCH} == 'master' ]]; then + cacert_file_vol="-v ${HOME}/os_cacert:/home/opnfv/functest/conf/os_cacert" + echo "export OS_CACERT=/home/opnfv/functest/conf/os_cacert" >> ${HOME}/opnfv-openrc.sh + rc_file_vol="-v ${HOME}/opnfv-openrc.sh:/home/opnfv/functest/conf/openstack.creds" else rc_file_vol="-v ${HOME}/opnfv-openrc.sh:/home/opnfv/functest/conf/openstack.creds" fi @@ -54,7 +58,7 @@ if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} == *'os-nosdn-openo-h fi if [ "$BRANCH" != 'stable/danube' ]; then - volumes="${images_vol} ${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol}" + volumes="${images_vol} ${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol} ${cacert_file_vol}" else volumes="${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol}" fi |