From 6f6cf24f53add8df9cd976da3ba211ab564814fd Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Mon, 19 Mar 2018 11:20:40 +0100 Subject: [PATCH] Use /root/.kube/config for all installers MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit There is no reason to use one specific dir per installer in Functest containers. Change-Id: Ib2e1443b14c15aa385e65194f70f6442e0c9f7b9 Signed-off-by: Cédric Ollivier --- jjb/functest/functest-k8.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh index 115ff4219..75bed7a4d 100755 --- a/jjb/functest/functest-k8.sh +++ b/jjb/functest/functest-k8.sh @@ -19,7 +19,7 @@ if [[ ${INSTALLER_TYPE} == 'compass' ]]; then KUBE_MASTER_IP=$(echo $KUBE_MASTER_URL|awk -F'https://|:[0-9]+' '$0=$2') echo "export KUBE_MASTER_IP=$KUBE_MASTER_IP" >> $rc_file elif [[ ${INSTALLER_TYPE} == 'joid' && ${BRANCH} == 'master' ]]; then - admin_conf_file_vol="-v ${HOME}/joid_config/config:/root/joid_config/config" + admin_conf_file_vol="-v ${HOME}/joid_config/config:/root/.kube/config" rc_file=${HOME}/joid_config/k8config else echo "Not supported by other installers yet" -- 2.16.6