From 34d72eb1a6e276473953099359605cc555a7bcf7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Tue, 30 Oct 2018 17:38:19 +0100 Subject: [PATCH] Write the right default values in DOCKER_TAG MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It avoids facing with wrong substitutions [1] [1] https://build.opnfv.org/ci/job/functest-apex-baremetal-daily-gambia/23/console Change-Id: I4b8c990add51024d7984cd10668a33dd7c50c395 Signed-off-by: Cédric Ollivier --- jjb/apex/apex.yaml | 3 ++- jjb/apex/apex.yaml.j2 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 454c69057..8fd976ad1 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -586,7 +586,8 @@ echo "DOCKER_TAG=hunter" > functest_scenario else functest_scenario=$DEPLOY_SCENARIO - echo "DOCKER_TAG=''" > functest_scenario + echo "DOCKER_TAG=$([[ ${BRANCH##*/} == "master" ]] && \ + echo "latest" || echo ${BRANCH##*/})" > functest_scenario fi echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario - inject: diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index daf2ce8b7..b2deb7313 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -432,7 +432,8 @@ echo "DOCKER_TAG=hunter" > functest_scenario else functest_scenario=$DEPLOY_SCENARIO - echo "DOCKER_TAG=''" > functest_scenario + echo "DOCKER_TAG=$([[ ${BRANCH##*/} == "master" ]] && \ + echo "latest" || echo ${BRANCH##*/})" > functest_scenario fi echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario - inject: -- 2.16.6