From: Serena Feng Date: Wed, 4 Apr 2018 07:06:11 +0000 (+0000) Subject: Merge "[QTIP] extend the timeout" X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=19b96727f7e29280cb58827f1208c5ebb03deac1;hp=be863c21d3808faf9372018b3ed4c6ba599c40a4;p=releng.git Merge "[QTIP] extend the timeout" --- diff --git a/jjb/functest/functest-env-presetup.sh b/jjb/functest/functest-env-presetup.sh index 4738121de..323b325b4 100755 --- a/jjb/functest/functest-env-presetup.sh +++ b/jjb/functest/functest-env-presetup.sh @@ -49,7 +49,7 @@ elif [[ ${INSTALLER_TYPE} == 'daisy' ]]; then elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then if [[ ! "${BRANCH}" =~ "danube" ]]; then echo "Map mcp ssh_key" - export sshkey_vol="-v ${SSH_KEY}:/root/.ssh/id_rsa" + export sshkey_vol="-v ${SSH_KEY:-/var/lib/opnfv/mcp.rsa}:/root/.ssh/id_rsa" fi fi