diff options
| author |   Jun Li <lijun_1203@126.com> | 2017-09-30 03:52:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-30 03:52:37 +0000 |
| commit | 2525e2973f1386761c6a3222d5c349789665717e (patch) | |
| tree | 11ef4f4dfd39ab3f43c032ed22f3e6e6e9435614 /jjb | |
| parent | fa7c5d4f2024565623dc9d47e8dd900f0628443a (diff) | |
| parent | 530c95e4e076ffabe5a803fdfdfc5292c6dfba75 (diff) | |
Merge "[Yardstick]Enable using the CACERT file in all compass branches"
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/yardstick/yardstick-daily.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh index 5398a3402..a2d4ec20a 100755 --- a/jjb/yardstick/yardstick-daily.sh +++ b/jjb/yardstick/yardstick-daily.sh @@ -32,7 +32,7 @@ if [[ ${INSTALLER_TYPE} == 'joid' ]]; then # If dev lab, credentials may not be the default ones, just provide a path to put them into docker # replace the default one by the customized one provided by jenkins config fi -elif [[ ${INSTALLER_TYPE} == 'compass' && ${BRANCH} == 'master' ]]; then +elif [[ ${INSTALLER_TYPE} == 'compass' ]]; then cacert_file_vol="-v ${HOME}/os_cacert:/etc/yardstick/os_cacert" echo "export OS_CACERT=/etc/yardstick/os_cacert" >> ${HOME}/opnfv-openrc.sh rc_file_vol="-v ${HOME}/opnfv-openrc.sh:/etc/yardstick/openstack.creds" |