diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-10-29 03:19:47 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-10-29 03:51:12 +0100 |
| commit | efc5f89524b4e54ba303885398943a93652d3c63 (patch) | |
| tree | 4c53c17a832a0b0669b8b950b068f5e71a125335 | |
| parent | 082d942902c4d822d64affaa3c0ce0bc9e1d1774 (diff) | |
Define DOCKER_TAG in Functest daily job
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 <cedric.ollivier@orange.com>
| -rw-r--r-- | jjb/apex/apex.yaml | 2 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 2 | ||||
| -rw-r--r-- | 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 @@ -292,6 +292,9 @@ name: DEPLOY_SCENARIO default: 'os-nosdn-nofeature-noha' - string: + name: DOCKER_TAG + default: '' + - string: name: CLEAN_DOCKER_IMAGES default: 'false' description: 'Remove downloaded docker images (opnfv/functest*:*)' |