diff options
author | Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-01-16 18:57:52 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-01-16 18:57:52 +0000 |
commit | 8a2c682eb920ba5741577161ea23a678356da204 (patch) | |
tree | 1e25aa5f71fc183c637f46bfcc5ee3ec16e37af7 /jjb/releng/functest-docker.yml | |
parent | 4c5197806b1ce162e19854975648528b1d10e2e2 (diff) | |
parent | 640a4e231f3336cb06c611d88c6e8fed8976274b (diff) |
Merge "Docker Builds from Git Tag"
Diffstat (limited to 'jjb/releng/functest-docker.yml')
-rw-r--r-- | jjb/releng/functest-docker.yml | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/jjb/releng/functest-docker.yml b/jjb/releng/functest-docker.yml index 147bcda98..584dc302c 100644 --- a/jjb/releng/functest-docker.yml +++ b/jjb/releng/functest-docker.yml @@ -41,7 +41,7 @@ predefined-parameters: | PUSH_IMAGE=$PUSH_IMAGE COMMIT_ID=$COMMIT_ID - RELEASE_VERSION=$RELEASE_VERSION + GERRIT_REFNAME=$GERRIT_REFNAME DOCKERFILE=$DOCKERFILE kill-phase-on: FAILURE abort-all-jobs: false @@ -51,7 +51,7 @@ git-revision: true node-parameters: false predefined-parameters: - RELEASE_VERSION=$RELEASE_VERSION + GERRIT_REFNAME=$GERRIT_REFNAME kill-phase-on: FAILURE abort-all-jobs: false @@ -89,6 +89,8 @@ triggers: - pollscm: cron: "*/30 * * * *" + - gerrit-trigger-tag-created: + project: '{project}' builders: - multijob: @@ -200,10 +202,6 @@ 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' @@ -249,9 +247,9 @@ default: "" description: "commit id to make a snapshot docker image" - string: - name: RELEASE_VERSION + name: GERRIT_REFNAME default: "" - description: "Docker tag to be built, e.g. 5.0.0, opnfv-5.0.0, 5.0.RC1" + description: "Docker tag to be built, e.g. refs/tags/5.0.0, refs/tags/opnfv-5.0.0, refs/tags/5.0.RC1" - string: name: DOCKERFILE default: "Dockerfile" |