From efc5f89524b4e54ba303885398943a93652d3c63 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 29 Oct 2018 03:19:47 +0100 Subject: Define DOCKER_TAG in Functest daily job MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It defines DOCKER_TAG as parameter in Functest daily job. It also fixes DOCKER_TAG default value in properties files and then complete the previous commit [1]. It should fix the current gate issues [2]. [1] https://gerrit.opnfv.org/gerrit/#/c/64069/ [2] https://build.opnfv.org/ci/view/functest/job/functest-apex-baremetal-daily-gambia/18/console Change-Id: Ia531ca68a455cc20294e123286062265b9b79d6f Signed-off-by: Cédric Ollivier --- jjb/apex/apex.yaml | 2 +- jjb/apex/apex.yaml.j2 | 2 +- jjb/functest/functest-daily-jobs.yaml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 33aec192e..7a9106e38 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -586,7 +586,7 @@ echo "DOCKER_TAG=hunter" > functest_scenario else functest_scenario=$DEPLOY_SCENARIO - DOCKER_TAG='' + echo "DOCKER_TAG=''" > 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 281a09bf2..329d2c9f5 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -432,7 +432,7 @@ echo "DOCKER_TAG=hunter" > functest_scenario else functest_scenario=$DEPLOY_SCENARIO - DOCKER_TAG='' + echo "DOCKER_TAG=''" > functest_scenario fi echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario - inject: diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 8d3883a0f..34aee8a9d 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -291,6 +291,9 @@ - string: name: DEPLOY_SCENARIO default: 'os-nosdn-nofeature-noha' + - string: + name: DOCKER_TAG + default: '' - string: name: CLEAN_DOCKER_IMAGES default: 'false' -- cgit 1.2.3-korg