From 9a9e8d971c98f6ca94223c05070f1ad97f7ed50f Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 21 Oct 2018 11:41:06 +0200 Subject: Allow overriding DOCKER_TAG in functest-alpine.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's mainly required by functest-apex-baremetal-daily-master which runs vs OpenStack master and OpenStack Rocky. Change-Id: I5e32f5b507fbe79a02bf5c61e67aa7f8c24f7789 Signed-off-by: Cédric Ollivier --- jjb/functest/functest-alpine.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'jjb/functest') diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 8aef9a02a..c2cfed980 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -8,6 +8,7 @@ REPO=${REPO:-opnfv} CI_LOOP=${CI_LOOP:-daily} TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results ENERGY_RECORDER_API_URL=http://energy.opnfv.fr/resources +DOCKER_TAG=${DOCKER_TAG:-$([[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/})} check_os_deployment() { FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} @@ -87,7 +88,6 @@ FUNCTEST_DIR=/home/opnfv/functest DEPLOY_TYPE=baremetal [[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt HOST_ARCH=$(uname -m) -DOCKER_TAG=`[[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/}` # Prepare OpenStack credentials volume rc_file=${HOME}/opnfv-openrc.sh -- cgit 1.2.3-korg