summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2015-12-17 09:59:10 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-17 09:59:10 +0000
commit1742106811e2fd38a2ba481d0bff3db5b4b47967 (patch)
tree8761983f139f57727b98f6fbb86e1ef4a9d0fb53
parentc7a38f0f49d229a410ca6cb9c934d0eefc157249 (diff)
parentb24d31936e464bfcfb8dd45e88254116842fbcb0 (diff)
Merge "Add volume to get joid creds for production CI"
-rw-r--r--jjb/functest/functest.yml18
1 files changed, 11 insertions, 7 deletions
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 1a9ba6239..346b678ac 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -190,26 +190,30 @@
- shell: |
#!/bin/bash
set +e
+ # labconfig is used only for joid
+ labconfig=""
if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
INSTALLER_IP=$(grep instack /var/lib/libvirt/dnsmasq/default.leases \
|awk '{print $3}' | head -n 1)
sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable
sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable
+ elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then
+ # If production lab then creds may be retrieved dynamically
+ # creds are on the jumphost, always in the same folder
+ labconfig="-v /home/ubuntu/joid/ci/cloud/admin-openrc:/home/opnfv/functest/conf/openstack.creds"
+ # If dev lab, credentials may not be the default ones, just provide a path to put them into docker
+ # replace the default one by the customized one provided by jenkins config
+ if [ -n "${LAB_CONFIG}" ]; then
+ labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds"
+ fi
fi
echo "Functest: Start Docker and prepare environment"
envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME}"
- labconfig=""
- # If production lab then creds may be retrieved dynamically
- # If dev lab, credentials may not be the default ones, just provide a path to put them into docker
- if [ -n "${LAB_CONFIG}" ]; then
- labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds"
- fi
dir_result="${HOME}/opnfv/functest/reports"
mkdir -f ${dir_result}
rm -rf ${dir_result}/*
-
$res_volume="-v ${dir_result}:/home/opnfv/functest/results"
docker pull opnfv/functest:latest_stable