summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2018-02-28 02:01:25 +0000
committerLinda Wang <wangwulin@huawei.com>2018-02-28 02:01:25 +0000
commit23bf5c7e8ce3f7212abc5d9c628284c1f092a0d5 (patch)
tree20703f0ef292141f621e3c7433ce7febe3850db6
parent146464fc62732f55904b74e5a2327fd2f257114f (diff)
[Functest] Run k8s tests on Joid
Change-Id: I43ba42b2181b7f89a3f551a12eed4ab42d89cbee Signed-off-by: Linda Wang <wangwulin@huawei.com>
-rwxr-xr-xjjb/functest/functest-k8.sh3
-rwxr-xr-xutils/fetch_k8_conf.sh6
2 files changed, 7 insertions, 2 deletions
diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh
index 888aded81..7c5308d5f 100755
--- a/jjb/functest/functest-k8.sh
+++ b/jjb/functest/functest-k8.sh
@@ -18,6 +18,9 @@ if [[ ${INSTALLER_TYPE} == 'compass' ]]; then
echo "export KUBE_MASTER_URL=$KUBE_MASTER_URL" >> $rc_file
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
diff --git a/utils/fetch_k8_conf.sh b/utils/fetch_k8_conf.sh
index f82fa5497..32c07f8b6 100755
--- a/utils/fetch_k8_conf.sh
+++ b/utils/fetch_k8_conf.sh
@@ -52,12 +52,14 @@ else
touch $dest_path || error "Cannot create the file specified. Check that the path is correct and run the script again."
fi
-info "Fetching admin.conf file..."
if [ "$installer_type" == "compass" ]; then
+ info "Fetching admin.conf file on Compass"
sudo docker cp compass-tasks:/opt/admin.conf $dest_path &> /dev/null
sudo chown $(whoami):$(whoami) $dest_path
info "Fetch admin.conf successfully"
+elif [ "$installer_type" == "joid" ]; then
+ info "Do nothing, config file has been provided in $HOME/joid_config/config for joid"
else
- error "Installer $installer is not supported by this script"
+ error "Installer $installer_type is not supported by this script"
fi