summaryrefslogtreecommitdiffstats
path: root/jjb/functest
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-06-15 13:59:19 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-15 13:59:19 +0000
commit65de755b81f4ece54e0f18c551fed424172dbfae (patch)
tree8b0a5f5738e3b8e4a5c9778e64bc12be490e8c47 /jjb/functest
parentd016482597c74c18c58f7efcd17bf3f497b2a2d6 (diff)
parent17eb662f921c57049639e132ceb5f8915d7bff34 (diff)
Merge "Functest, add stackrc file to container for security tests in Apex"
Diffstat (limited to 'jjb/functest')
-rwxr-xr-xjjb/functest/set-functest-env.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh
index b3be3abe1..24e9e2666 100755
--- a/jjb/functest/set-functest-env.sh
+++ b/jjb/functest/set-functest-env.sh
@@ -17,6 +17,9 @@ if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
fi
INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $1'})
sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
+ sudo scp root@${INSTALLER_IP}:/home/stack/stackrc .
+ stackrc="-v ./stackrc:/home/functest/stackrc"
+
if sudo iptables -C FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable 2> ${redirect}; then
sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable
fi
@@ -45,7 +48,7 @@ test -f ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG} && custom_params=$(ca
echo "Functest: Pulling image opnfv/functest:${DOCKER_TAG}"
docker pull opnfv/functest:$DOCKER_TAG >/dev/null
-cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} ${custom_params} opnfv/functest:${DOCKER_TAG} /bin/bash"
+cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} ${custom_params} ${stackrc} opnfv/functest:${DOCKER_TAG} /bin/bash"
echo "Functest: Running docker run command: ${cmd}"
${cmd} >${redirect}
sleep 5