summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2017-11-14 11:03:44 +0100
committerFatih Degirmenci <fdegir@gmail.com>2017-11-14 11:03:44 +0100
commit5bf9ad7a7bfc260cf02531071a8af4b23f75bdf0 (patch)
treeb03a253cfbbf81a1b10f74b94ec29507421a37f1
parentd888c77724fde742f453fa1c6a93c977237199c5 (diff)
functest: Fix parameters for docker build jobs
Change-Id: Id692673fbd47ba623d52970327dbc6360843b253 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
-rw-r--r--jjb/releng/functest-docker.yml12
1 files changed, 5 insertions, 7 deletions
diff --git a/jjb/releng/functest-docker.yml b/jjb/releng/functest-docker.yml
index ed6dfcecf..9694e1203 100644
--- a/jjb/releng/functest-docker.yml
+++ b/jjb/releng/functest-docker.yml
@@ -43,7 +43,6 @@
COMMIT_ID=$COMMIT_ID
RELEASE_VERSION=$RELEASE_VERSION
DOCKERFILE=$DOCKERFILE
- ARCH_TAG=$ARCH_TAG
kill-phase-on: FAILURE
abort-all-jobs: false
@@ -51,9 +50,8 @@
current-parameters: false
git-revision: true
node-parameters: false
- predefined-parameters: |
+ predefined-parameters:
RELEASE_VERSION=$RELEASE_VERSION
- ARCH_TAG=$ARCH_TAG
kill-phase-on: FAILURE
abort-all-jobs: false
@@ -79,10 +77,6 @@
branch: '{branch}'
slave_label: 'opnfv-build-ubuntu'
arch_tag: 'amd64'
- - string:
- name: ARCH_TAG
- default: "{arch_tag}"
- description: "If set, this value will be added to the docker image tag as a prefix"
properties:
- throttle:
@@ -202,6 +196,10 @@
default: "{project}"
description: "Project name used to enable job conditions"
- string:
+ name: RELEASE_VERSION
+ default: ""
+ description: "Docker tag to be built, e.g. 5.0.0, opnfv-5.0.0, 5.0.RC1"
+ - string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'