summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorchenjiankun <chenjiankun1@huawei.com>2017-08-31 03:17:25 +0000
committerchenjiankun <chenjiankun1@huawei.com>2017-08-31 03:17:25 +0000
commit464aa07a3f9b267b30478e4b4a0e323f032f5059 (patch)
treed8a248b9afc72e5c8ca87443e26965292f1352fd /jjb
parentede0336258973c16ec2ba557ec7c8a2bc2cc8168 (diff)
Using juju ssh command to run kubernetes test case
On joid kubernetes deployment we can't ssh container from jumpserver. So we need to start yardstick on kubernetes master node. Change-Id: I9a1308d401cdacef63690088ac22bd555927bea3 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/yardstick/yardstick-daily.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh
index ccee9715f..c91ea47a1 100755
--- a/jjb/yardstick/yardstick-daily.sh
+++ b/jjb/yardstick/yardstick-daily.sh
@@ -20,7 +20,7 @@ fi
if [[ ${INSTALLER_TYPE} == 'joid' ]]; then
if [[ "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then
- rc_file_vol="-v $LAB_CONFIG/admin.conf:/etc/yardstick/admin.conf"
+ rc_file_vol="-v /home/ubuntu/config:/etc/yardstick/admin.conf"
else
# If production lab then creds may be retrieved dynamically
# creds are on the jumphost, always in the same folder
@@ -59,8 +59,14 @@ sudo rm -rf ${dir_result}/*
map_log_dir="-v ${dir_result}:/tmp/yardstick"
# Run docker
-cmd="sudo docker run ${opts} ${envs} ${rc_file_vol} ${cacert_file_vol} ${map_log_dir} ${sshkey} opnfv/yardstick:${DOCKER_TAG} \
+if [[ ${INSTALLER_TYPE} == "joid" && "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then
+ juju ssh kubernetes-master/0 sudo apt-get install docker.io
+ cmd="juju ssh kubernetes-master/0 sudo docker run ${opts} ${envs} ${rc_file_vol} ${cacert_file_vol} ${map_log_dir} ${sshkey} opnfv/yardstick:${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} opnfv/yardstick:${DOCKER_TAG} \
exec_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SCENARIO_SUITE_NAME}"
+fi
+
echo "Yardstick: Running docker cmd: ${cmd}"
${cmd}