summaryrefslogtreecommitdiffstats
path: root/jjb/apex/apex.yaml.j2
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-10-26 14:11:43 +0200
committerTim Rozet <trozet@redhat.com>2018-10-26 09:10:41 -0400
commit082d942902c4d822d64affaa3c0ce0bc9e1d1774 (patch)
tree9b6b6c942137082db8996ccdc9788732f26836ba /jjb/apex/apex.yaml.j2
parent2b8a30872c4d1e5fe9dbe310ba206522c02115b8 (diff)
Set empty strings in DOCKER_TAG by default
It let functest-alpine process branches right after [1]. [1] https://build.opnfv.org/ci/job/functest-apex-virtual-suite-master/241/console Change-Id: I6ed804fe9f3628f67421157433e09da3bcbf585c Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb/apex/apex.yaml.j2')
-rw-r--r--jjb/apex/apex.yaml.j26
1 files changed, 6 insertions, 0 deletions
diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 4d77f4a39..281a09bf2 100644
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -432,6 +432,7 @@
echo "DOCKER_TAG=hunter" > functest_scenario
else
functest_scenario=$DEPLOY_SCENARIO
+ DOCKER_TAG=''
fi
echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario
- inject:
@@ -487,6 +488,10 @@
name: DEPLOY_SCENARIO
default: '{scenario}'
description: "Scenario to deploy with."
+ - string:
+ name: DOCKER_TAG
+ default: ''
+ description: Default docker tag to pass to functest
properties:
- logrotate-default
@@ -515,6 +520,7 @@
current-parameters: false
predefined-parameters:
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ DOCKER_TAG=$DOCKER_TAG
kill-phase-on: NEVER
abort-all-job: false
git-revision: false