summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-03-19 11:20:40 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2018-03-19 11:21:47 +0100
commit6f6cf24f53add8df9cd976da3ba211ab564814fd (patch)
tree1c3dca1066bed1212e2b273c34fa09e1c9b81324 /jjb
parentc560df67104dde2734cb6962324a55e4c2420e33 (diff)
Use /root/.kube/config for all installers
There is no reason to use one specific dir per installer in Functest containers. Change-Id: Ib2e1443b14c15aa385e65194f70f6442e0c9f7b9 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/functest/functest-k8.sh2
1 files changed, 1 insertions, 1 deletions
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"