summaryrefslogtreecommitdiffstats
path: root/jjb/functest
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2015-12-08 20:20:45 +0100
committerjose.lausuch <jose.lausuch@ericsson.com>2015-12-08 20:24:26 +0100
commit8a5f7a68dce9d422352627ccf6e79ac2de6b78b3 (patch)
treea934cb9fbfe481649de08e4fb22fb52ea0b31710 /jjb/functest
parent2a09650c83b5d896820259198492f9e4d108c3f5 (diff)
Force copy of private ssh key if apex in functest jjob
Also, remove previous parameter from macros (not needed) Change-Id: I4100ff1322560e79ca4511f0a05c87335ed6be67 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'jjb/functest')
-rw-r--r--jjb/functest/functest.yml13
1 files changed, 1 insertions, 12 deletions
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 95a2cbcbc..e55164b67 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -22,11 +22,6 @@
installer_type: 'compass'
installer_ip: '192.168.200.2'
pod:
- - opnfv-jump-1:
- node: 'opnfv-jump-1'
- installer_type: 'apex'
- installer_ip: '192.168.X.X'
-
- orange-test1:
node: 'orange-test1'
installer_type: 'fuel'
@@ -386,10 +381,6 @@
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 private key to access the installer VM"
- parameter:
name: huawei-build
@@ -444,6 +435,7 @@
if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
INSTALLER_IP=$(cat instack /var/lib/libvirt/dnsmasq/default.leases \
|sed 's/.*192/192/g' | sed 's/\ in.*//g')
+ sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
fi
echo "Functest: Start Docker and prepare environment"
envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME}"
@@ -453,9 +445,6 @@
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} ${sshkey} opnfv/functest:latest_stable /bin/bash"