From: JingLu5 <lvjing5@huawei.com>
Date: Sat, 30 Sep 2017 01:11:49 +0000 (+0000)
Subject: [Yardstick]Enable using the CACERT file in all compass branches
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=530c95e4e076ffabe5a803fdfdfc5292c6dfba75;p=releng.git

[Yardstick]Enable using the CACERT file in all compass branches

Change-Id: Ia699a23d292ea2c18f309022352f83a22041626a
Signed-off-by: JingLu5 <lvjing5@huawei.com>
---

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"