summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2017-09-29 16:34:52 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-29 16:34:52 +0000
commitf7c64a2b10cc0f727f4bd40afa7ed8eda27ffacc (patch)
treee640509fb71d1c562273fb2eabe269294e443ada
parentc65ca34d344798756596c056dc3162757a744e47 (diff)
parent52eceb02d30521d057e3c3db7e65691b11248406 (diff)
Merge "Add mcp.rsa in the yardstick container for fuel"
-rwxr-xr-xjjb/yardstick/yardstick-daily.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh
index 8b3980fbc..5398a3402 100755
--- a/jjb/yardstick/yardstick-daily.sh
+++ b/jjb/yardstick/yardstick-daily.sh
@@ -18,6 +18,10 @@ if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
fi
fi
+if [[ "${INSTALLER_TYPE}" == 'fuel' ]]; then
+ sshkey="-v ${SSH_KEY}:/root/.ssh/mcp.rsa"
+fi
+
if [[ ${INSTALLER_TYPE} == 'joid' ]]; then
if [[ "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then
rc_file_vol="-v /home/ubuntu/config:/etc/yardstick/admin.conf"
@@ -47,6 +51,10 @@ envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
-e YARDSTICK_BRANCH=${BRANCH} -e BRANCH=${BRANCH} \
-e DEPLOY_SCENARIO=${DEPLOY_SCENARIO}"
+if [[ "${INSTALLER_TYPE}" == 'fuel' ]]; then
+ envs+=" -e SSH_KEY=/root/.ssh/mcp.rsa"
+fi
+
# Pull the image with correct tag
DOCKER_REPO='opnfv/yardstick'
if [ "$(uname -m)" = 'aarch64' ]; then