diff options
| author |   JingLu5 <lvjing5@huawei.com> | 2017-09-30 01:11:49 +0000 |
|---|---|---|
| committer | JingLu5 <lvjing5@huawei.com> | 2017-09-30 01:17:40 +0000 |
| commit | 530c95e4e076ffabe5a803fdfdfc5292c6dfba75 (patch) | |
| tree | e6e6e0b185944ff1ca120972a5512fe7852e1ac1 /jjb/yardstick | |
| parent | f7c64a2b10cc0f727f4bd40afa7ed8eda27ffacc (diff) | |
[Yardstick]Enable using the CACERT file in all compass branches
Change-Id: Ia699a23d292ea2c18f309022352f83a22041626a
Signed-off-by: JingLu5 <lvjing5@huawei.com>
Diffstat (limited to 'jjb/yardstick')
| -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" |