diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2016-07-25 15:34:15 +0200 |
|---|---|---|
| committer | Jose Lausuch <jose.lausuch@ericsson.com> | 2016-07-25 14:23:44 +0000 |
| commit | c7cd8087c0df17dcbc5e97d62ef942e5cf344028 (patch) | |
| tree | d6e7f9f11b185345d54f382becdc3f0ab3eeab55 /jjb | |
| parent | 3661a87d2cc920f1a14f4f813e30833504dc313e (diff) | |
[Functest] Add DEPLOY_TYPE in the container creation
Change-Id: Id06771db96d1ca014c153ffc2b7567d6b2ea07ea
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/functest/set-functest-env.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index d2e232de5..b7d745a79 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -41,10 +41,13 @@ if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || ! sudo iptables -L FOR sudo iptables -I FORWARD -j RETURN fi +DEPLOY_TYPE=baremetal +[[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt + echo "Functest: Start Docker and prepare environment" envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \ - -e BUILD_TAG=${BUILD_TAG} -e CI_DEBUG=${CI_DEBUG}" + -e BUILD_TAG=${BUILD_TAG} -e CI_DEBUG=${CI_DEBUG} -e DEPLOY_TYPE=${DEPLOY_TYPE}" branch=${GIT_BRANCH##*/} dir_result="${HOME}/opnfv/functest/results/${branch}" mkdir -p ${dir_result} |