summaryrefslogtreecommitdiffstats
path: root/jjb/yardstick
diff options
context:
space:
mode:
authorCristina Pauna <cristina.pauna@enea.com>2017-09-29 13:47:37 +0300
committerCristina Pauna <cristina.pauna@enea.com>2017-09-29 14:54:19 +0300
commit52eceb02d30521d057e3c3db7e65691b11248406 (patch)
tree7296ab39ecf3839ba035b01eab7aa9ba3bccacee /jjb/yardstick
parent924e1f3fbde9aea8f7c371ebf52d91103930b968 (diff)
Add mcp.rsa in the yardstick container for fuel
For Fuel, the mcp.rsa key is needed in the container to be able to connect to the POD nodes. The key is set in the global installer parameters and passed to the container. Also the SSH_KEY enviroment variable is set with the path of the key. Change-Id: I1888414abc9f6c2d8ac741f2d6f04f5e7a37912b Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
Diffstat (limited to 'jjb/yardstick')
-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