summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchenjiankun <chenjiankun1@huawei.com>2018-01-05 06:41:00 +0000
committerchenjiankun <chenjiankun1@huawei.com>2018-01-05 06:41:00 +0000
commit1378347a112fe9b1058af940d65b2164d8fc7c5c (patch)
tree073c34ce46a87ce23ff530eeb9135b272630360f
parent7bcdf35a5536583f902454505b2eee77b1f8a628 (diff)
Enable kubernetes test suite for compass
Compass will put admin.conf file in /opt/admin.conf in compass-tasks container. We need to cp it to $HOME/admin.conf, then do a volume mapping so that yardstick docker container can have this file. Change-Id: I33b9ab4e44e363bd8375805bad7d8e5bf6af97fa Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
-rwxr-xr-xjjb/yardstick/yardstick-daily.sh19
-rwxr-xr-xjjb/yardstick/yardstick-get-k8s-conf.sh6
2 files changed, 14 insertions, 11 deletions
diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh
index 4b8c5d240..f0e4f8e22 100755
--- a/jjb/yardstick/yardstick-daily.sh
+++ b/jjb/yardstick/yardstick-daily.sh
@@ -22,7 +22,7 @@ fi
if [[ ${INSTALLER_TYPE} == 'joid' ]]; then
if [[ "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then
- rc_file_vol="-v /home/ubuntu/config:/etc/yardstick/admin.conf"
+ rc_file_vol="-v ${HOME}/admin.conf:/etc/yardstick/admin.conf"
else
# If production lab then creds may be retrieved dynamically
# creds are on the jumphost, always in the same folder
@@ -31,8 +31,12 @@ if [[ ${INSTALLER_TYPE} == 'joid' ]]; then
# replace the default one by the customized one provided by jenkins config
fi
elif [[ ${INSTALLER_TYPE} == 'compass' ]]; then
- cacert_file_vol="-v ${HOME}/os_cacert:/etc/yardstick/os_cacert"
- echo "export OS_CACERT=/etc/yardstick/os_cacert" >> ${HOME}/opnfv-openrc.sh
+ if [[ "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then
+ rc_file_vol="-v ${HOME}/admin.conf:/etc/yardstick/admin.conf"
+ else
+ cacert_file_vol="-v ${HOME}/os_cacert:/etc/yardstick/os_cacert"
+ echo "export OS_CACERT=/etc/yardstick/os_cacert" >> ${HOME}/opnfv-openrc.sh
+ fi
elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then
cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert"
sshkey="-v ${SSH_KEY}:/root/.ssh/mcp.rsa"
@@ -68,13 +72,8 @@ sudo rm -rf ${dir_result}/*
map_log_dir="-v ${dir_result}:/tmp/yardstick"
# Run docker
-if [[ ${INSTALLER_TYPE} == "joid" && "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then
- juju ssh kubernetes-master/0 sudo apt-get install -y docker.io
- cmd="juju ssh kubernetes-master/0 sudo docker run ${opts} ${envs} ${rc_file_vol} ${cacert_file_vol} ${map_log_dir} ${sshkey} ${DOCKER_REPO}:${DOCKER_TAG} exec_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SCENARIO_SUITE_NAME}"
-else
- cmd="sudo docker run ${opts} ${envs} ${rc_file_vol} ${cacert_file_vol} ${map_log_dir} ${sshkey} ${DOCKER_REPO}:${DOCKER_TAG} \
- exec_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SCENARIO_SUITE_NAME}"
-fi
+cmd="sudo docker run ${opts} ${envs} ${rc_file_vol} ${cacert_file_vol} ${map_log_dir} ${sshkey} ${DOCKER_REPO}:${DOCKER_TAG} \
+exec_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SCENARIO_SUITE_NAME}"
echo "Yardstick: Running docker cmd: ${cmd}"
${cmd}
diff --git a/jjb/yardstick/yardstick-get-k8s-conf.sh b/jjb/yardstick/yardstick-get-k8s-conf.sh
index e93367f9a..22a6aa4e6 100755
--- a/jjb/yardstick/yardstick-get-k8s-conf.sh
+++ b/jjb/yardstick/yardstick-get-k8s-conf.sh
@@ -4,5 +4,9 @@ set -e
dest_path="$HOME/admin.conf"
if [[ "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then
- juju scp kubernetes-master/0:config "${dest_path}"
+ if [[ ${INSTALLER_TYPE} == 'joid' ]];then
+ juju scp kubernetes-master/0:config "${dest_path}"
+ elif [[ ${INSTALLER_TYPE} == 'compass' ]];then
+ docker cp compass-tasks:/opt/admin.conf "${dest_path}"
+ fi
fi