summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-06-05 19:14:18 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-06-05 19:14:18 +0200
commite3a283986bc57f45b66842cec88015a0455c08c5 (patch)
treedb096f5fba9353cf4ee35d998b051631a523fad5
parentf527b7511f5302273c665a1b0bedcfbd9664f761 (diff)
Stop hardcoding Docker repository
Change-Id: I7c8a131b4f80b58ee136e63c547c4fe55822a134 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rwxr-xr-xjjb/functest/functest-alpine.sh17
-rw-r--r--jjb/functest/functest-daily-jobs.yaml4
2 files changed, 13 insertions, 8 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 1df9a554c..392f192cc 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -4,12 +4,13 @@ set -e
set +u
set +o pipefail
+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
check_os_deployment() {
- FUNCTEST_IMAGE=opnfv/functest-healthcheck:${DOCKER_TAG}
+ FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG}
echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
docker pull ${FUNCTEST_IMAGE}>/dev/null
cmd="docker run --rm --privileged=true ${volumes} ${FUNCTEST_IMAGE} check_deployment"
@@ -34,7 +35,7 @@ run_tiers() {
echo 0 > ${ret_val_file}
for tier in ${tiers[@]}; do
- FUNCTEST_IMAGE=opnfv/functest-${tier}:${DOCKER_TAG}
+ FUNCTEST_IMAGE=${REPO}/functest-${tier}:${DOCKER_TAG}
echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
docker pull ${FUNCTEST_IMAGE}>/dev/null
cmd="docker run --rm --privileged=true ${envs} ${volumes} ${TESTCASE_OPTIONS} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
@@ -59,17 +60,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:${DOCKER_TAG} ;;
+ FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} ;;
vping_ssh|vping_userdata|tempest_smoke_serial|rally_sanity|refstack_defcore|odl|odl_netvirt|snaps_smoke)
- FUNCTEST_IMAGE=opnfv/functest-smoke:${DOCKER_TAG} ;;
+ FUNCTEST_IMAGE=${REPO}/functest-smoke:${DOCKER_TAG} ;;
tempest_full_parallel|rally_full)
- FUNCTEST_IMAGE=opnfv/functest-components:${DOCKER_TAG} ;;
+ FUNCTEST_IMAGE=${REPO}/functest-components:${DOCKER_TAG} ;;
cloudify_ims|orchestra_openims|orchestra_clearwaterims|vyos_vrouter)
- FUNCTEST_IMAGE=opnfv/functest-vnf:${DOCKER_TAG} ;;
+ FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;;
promise|doctor-notification|bgpvpn|functest-odl-sfc|domino-multinode|barometercollectd|fds)
- FUNCTEST_IMAGE=opnfv/functest-features:${DOCKER_TAG} ;;
+ FUNCTEST_IMAGE=${REPO}/functest-features:${DOCKER_TAG} ;;
parser-basics)
- FUNCTEST_IMAGE=opnfv/functest-parser:${DOCKER_TAG} ;;
+ FUNCTEST_IMAGE=${REPO}/functest-parser:${DOCKER_TAG} ;;
*)
echo "Unkown test case $test_name"
exit 1
diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml
index 4fc67e7f8..c81046c13 100644
--- a/jjb/functest/functest-daily-jobs.yaml
+++ b/jjb/functest/functest-daily-jobs.yaml
@@ -338,6 +338,10 @@
name: RC_FILE_PATH
default: ''
description: "Path to the OS credentials file if given"
+ - string:
+ name: REPO
+ default: "opnfv"
+ description: "Repository name for functest images"
########################
# trigger macros
########################