[Yardstick]Enable using the CACERT file in all compass branches 79/43679/1
authorJingLu5 <lvjing5@huawei.com>
Sat, 30 Sep 2017 01:11:49 +0000 (01:11 +0000)
committerJingLu5 <lvjing5@huawei.com>
Sat, 30 Sep 2017 01:17:40 +0000 (01:17 +0000)
Change-Id: Ia699a23d292ea2c18f309022352f83a22041626a
Signed-off-by: JingLu5 <lvjing5@huawei.com>
jjb/yardstick/yardstick-daily.sh

index 5398a34..a2d4ec2 100755 (executable)
@@ -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"