X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-k8.sh;h=7c5308d5f4855960f8394fee7cb865c921c921fc;hb=23bf5c7e8ce3f7212abc5d9c628284c1f092a0d5;hp=6df5c53b0fefab08da32e7a316b75052ef9ddd28;hpb=3440fdad0d42cb6f77546d4618861b59f9a7cae6;p=releng.git diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh index 6df5c53b0..7c5308d5f 100755 --- a/jjb/functest/functest-k8.sh +++ b/jjb/functest/functest-k8.sh @@ -11,13 +11,16 @@ rc_file=${HOME}/k8.creds sudo rm -rf $rc_file if [[ ${INSTALLER_TYPE} == 'compass' ]]; then - admin_conf_file_vol = "-v ${HOME}/admin.conf:/root/.kube/config" + admin_conf_file_vol="-v ${HOME}/admin.conf:/root/.kube/config" echo "export KUBECONFIG=/root/.kube/config" >> $rc_file echo "export KUBERNETES_PROVIDER=local" >> $rc_file - KUBE_MASTER_URL = $(cat ${HOME}/admin.conf|grep server| awk '{print $2}') + KUBE_MASTER_URL=$(cat ${HOME}/admin.conf|grep server| awk '{print $2}') echo "export KUBE_MASTER_URL=$KUBE_MASTER_URL" >> $rc_file - KUBE_MASTER_IP = $(echo $KUBE_MASTER_URL|awk -F'https://|:[0-9]+' '$0=$2') + 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" + rc_file=${HOME}/joid_config/k8config else echo "Not supported by other installers yet" exit 1