Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "add testapi-client verify job"
[releng.git]
/
jjb
/
functest
/
functest-k8.sh
diff --git
a/jjb/functest/functest-k8.sh
b/jjb/functest/functest-k8.sh
index
6df5c53
..
7c5308d
100755
(executable)
--- 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
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
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
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
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
else
echo "Not supported by other installers yet"
exit 1