diff options
| author |   Jose Lausuch <jalausuch@suse.com> | 2017-09-27 00:15:32 +0200 |
|---|---|---|
| committer | Jose Lausuch <jalausuch@suse.com> | 2017-09-28 13:43:04 +0000 |
| commit | bf0fe6446dee2158f7f39d7886574a56ec11ba1c (patch) | |
| tree | df818bdd43038a996f2deecd22457b6c7a5a82a6 | |
| parent | 6c84af5a470c520e43973a0db010b62c35286724 (diff) | |
[Functest] Add DOCKER_TAG in Alpine images
Change-Id: I8a8d46798ea73364cf0f2b66464d3628d6d572d3
Signed-off-by: Jose Lausuch <jalausuch@suse.com>
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index fdc34810a..66c042a3b 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -12,7 +12,7 @@ run_tiers() { echo 0 > ${ret_val_file} for tier in ${tiers[@]}; do - FUNCTEST_IMAGE=opnfv/functest-${tier} + FUNCTEST_IMAGE=opnfv/functest-${tier}:${DOCKER_TAG} echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..." docker pull ${FUNCTEST_IMAGE}>/dev/null cmd="docker run --privileged=true ${envs} ${volumes} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'" @@ -34,17 +34,17 @@ run_test() { # Determine which Functest image should be used for the test case case ${test_name} in connection_check|api_check|snaps_health_check) - FUNCTEST_IMAGE=opnfv/functest-healthcheck ;; + FUNCTEST_IMAGE=opnfv/functest-healthcheck:${DOCKER_TAG} ;; vping_ssh|vping_userdata|tempest_smoke_serial|rally_sanity|refstack_defcore|odl|odl_netvirt|fds|snaps_smoke) - FUNCTEST_IMAGE=opnfv/functest-smoke ;; + FUNCTEST_IMAGE=opnfv/functest-smoke:${DOCKER_TAG} ;; tempest_full_parallel|tempest_custom|rally_full) - FUNCTEST_IMAGE=opnfv/functest-components ;; + FUNCTEST_IMAGE=opnfv/functest-components:${DOCKER_TAG} ;; cloudify_ims|orchestra_openims|orchestra_clearwaterims|vyos_vrouter) - FUNCTEST_IMAGE=opnfv/functest-vnf ;; + FUNCTEST_IMAGE=opnfv/functest-vnf:${DOCKER_TAG} ;; promise|doctor-notification|bgpvpn|functest-odl-sfc|domino-multinode|barometercollectd) - FUNCTEST_IMAGE=opnfv/functest-features ;; + FUNCTEST_IMAGE=opnfv/functest-features:${DOCKER_TAG} ;; parser-basics) - FUNCTEST_IMAGE=opnfv/functest-parser ;; + FUNCTEST_IMAGE=opnfv/functest-parser:${DOCKER_TAG} ;; *) echo "Unkown test case $test_name" exit 1 @@ -67,6 +67,7 @@ FUNCTEST_DIR=/home/opnfv/functest DEPLOY_TYPE=baremetal [[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt HOST_ARCH=$(uname -m) +DOCKER_TAG=${DOCKER_TAG:-latest} # Prepare OpenStack credentials volume rc_file=${HOME}/opnfv-openrc.sh |