diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-10-22 12:20:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-22 12:20:13 +0000 |
| commit | 9b164628deaf8bc495d4eabdb6458add7175cd32 (patch) | |
| tree | 9813caee16e23a4ca472e92e1b7ecaf030780b30 /jjb/functest | |
| parent | 2e54805dc614814cd2b7c09621549bab1538bb01 (diff) | |
| parent | 9a9e8d971c98f6ca94223c05070f1ad97f7ed50f (diff) | |
Merge "Allow overriding DOCKER_TAG in functest-alpine.sh"
Diffstat (limited to 'jjb/functest')
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |