From d11736f9dee35fac9aa3d79b4c2ae7356f71459a Mon Sep 17 00:00:00 2001
From: xudan <xudan16@huawei.com>
Date: Wed, 22 Nov 2017 02:01:14 -0500
Subject: Bugfix: Dovetail failed on Compass master because of lacking cacert

Dovetail daily jobs on Compass failed because of lacking os cacert file.
Add the cacert file path into env_config.sh and copy cacert file to pre_config/.

JIRA: DOVETAIL-564

Change-Id: I23506bf3dea7ad3e82bd826f4ea344f6ddd99cac
Signed-off-by: xudan <xudan16@huawei.com>
---
 jjb/dovetail/dovetail-run.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'jjb/dovetail')

diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index 2cbb94766..1825bd52a 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -24,6 +24,7 @@ mkdir -p ${DOVETAIL_CONFIG}
 sshkey=""
 # The path of openrc.sh is defined in fetch_os_creds.sh
 OPENRC=${DOVETAIL_CONFIG}/env_config.sh
+CACERT=${DOVETAIL_CONFIG}/os_cacert
 if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
     instack_mac=$(sudo virsh domiflist undercloud | grep default | \
                   grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+")
@@ -56,12 +57,22 @@ if [[ ${INSTALLER_TYPE} != 'joid' ]]; then
     echo "dovetail branch is $BRANCH"
     BRANCH_BACKUP=$BRANCH
     export BRANCH=$SUT_BRANCH
-    ${releng_repo}/utils/fetch_os_creds.sh -d ${OPENRC} -i ${INSTALLER_TYPE} -a ${INSTALLER_IP} >${redirect}
+    ${releng_repo}/utils/fetch_os_creds.sh -d ${OPENRC} -i ${INSTALLER_TYPE} -a ${INSTALLER_IP} -o ${CACERT} >${redirect}
     export BRANCH=$BRANCH_BACKUP
 fi
 
 if [[ -f $OPENRC ]]; then
     echo "INFO: openstack credentials path is $OPENRC"
+    if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == "compass" ]]; then
+        if [[ -f ${CACERT} ]]; then
+            echo "INFO: ${INSTALLER_TYPE} openstack cacert file is ${CACERT}"
+            echo "export OS_CACERT=${CACERT}" >> ${OPENRC}
+        else
+            echo "ERROR: Can't find ${INSTALLER_TYPE} openstack cacert file. Please check if it is existing."
+            sudo ls -al ${DOVETAIL_CONFIG}
+            exit 1
+        fi
+    fi
     cat $OPENRC
 else
     echo "ERROR: cannot find file $OPENRC. Please check if it is existing."
-- 
cgit