From: Gabriel Yu <Gabriel.yuyang@huawei.com>
Date: Thu, 19 Oct 2017 08:52:27 +0000 (+0800)
Subject: bug-fix: fix compass os_cert issue for bottlenecks euphrates
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c9823f7d84fcb16d4ca137bcb34b5b81f743d9df;p=releng.git

bug-fix: fix compass os_cert issue for bottlenecks euphrates

Change-Id: I74cae84ad2613ac25a1896ae5b57d38f08545818
Signed-off-by: Gabriel Yu <Gabriel.yuyang@huawei.com>
---

diff --git a/jjb/bottlenecks/bottlenecks-run-suite.sh b/jjb/bottlenecks/bottlenecks-run-suite.sh
index 0e325e115..cdcf0f05a 100644
--- a/jjb/bottlenecks/bottlenecks-run-suite.sh
+++ b/jjb/bottlenecks/bottlenecks-run-suite.sh
@@ -47,7 +47,7 @@ if [[ $SUITE_NAME == *posca* ]]; then
 
     if [[ -f ${OPENRC} ]]; then
         echo "BOTTLENECKS INFO: openstack credentials path is ${OPENRC}"
-        if [[ $INSTALLER_TYPE == 'compass' && ${BRANCH} == 'master' ]]; then
+        if [[ $INSTALLER_TYPE == 'compass' ]]; then
             echo "BOTTLENECKS INFO: writing ${OS_CACERT} to ${OPENRC}"
             echo "export OS_CACERT=${OS_CACERT}" >> ${OPENRC}
         fi