summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2015-12-08 15:18:18 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-08 15:18:18 +0000
commitea4c3552369fdeb44b15dcd00e338aa56868f4fa (patch)
tree97121c20287701abe327cc07398e55edb22abd7c
parent186c75520367313ec3ac55f3ffdd825f2c8b3b29 (diff)
parent4fd6d19fd487b46a4e65e223469ba141d528ebd4 (diff)
Merge "Pass ssh key to docker to be able to access the Instack VM without password"
-rw-r--r--jjb/functest/functest.yml10
1 files changed, 9 insertions, 1 deletions
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 4223e67ca..e76fe526b 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -375,6 +375,10 @@
name: GIT_BASE
default: ssh://gerrit.opnfv.org:29418/$PROJECT
description: "Override GIT_BASE"
+ - string:
+ name: SSH_KEY
+ default: "/root/.ssh/id_rsa"
+ description: "SSH public key to access the installer VM"
- parameter:
name: opnfv-jump-2
@@ -430,8 +434,12 @@
if [ -n "${LAB_CONFIG}" ]; then
labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds"
fi
+ if [ -n "${SSH_KEY}" ]; then
+ sshkey="-v ${SSH_KEY}:/root/.ssh/id_rsa"
+ fi
+
docker pull opnfv/functest:latest_stable
- cmd="docker run -id -e $envs ${labconfig} opnfv/functest:latest_stable /bin/bash"
+ cmd="docker run -id -e $envs ${labconfig} ${sshkey} opnfv/functest:latest_stable /bin/bash"
echo "Functest: Running docker run command: ${cmd}"
${cmd}
docker ps -a