diff options
author | Christoph Erhardt <christoph.erhardt@methodpark.de> | 2020-04-16 16:56:50 +0200 |
---|---|---|
committer | Christoph Erhardt <christoph.erhardt@methodpark.de> | 2020-04-16 16:56:50 +0200 |
commit | 03d99c56e8b728409ee82c2ae24d18e88ed5ce0f (patch) | |
tree | 31d14d776e31c6d909f743ec3b5a39a5d8261756 | |
parent | 9cff4f295ec8020fa3a3ac15795a344666596770 (diff) | |
download | python-jenkins-job-builder-03d99c56e8b728409ee82c2ae24d18e88ed5ce0f.tar.gz python-jenkins-job-builder-03d99c56e8b728409ee82c2ae24d18e88ed5ce0f.tar.xz python-jenkins-job-builder-03d99c56e8b728409ee82c2ae24d18e88ed5ce0f.zip |
Add parameter "cancel-pending-builds-on-update" for trigger "gitlab"
When this boolean parameter is set to true, updating a merge request
cancels any pending merge-request builds.
Change-Id: Ic5ef400cf4cd088680b92bd10b88b79520795729
-rw-r--r-- | jenkins_jobs/modules/triggers.py | 3 | ||||
-rw-r--r-- | tests/triggers/fixtures/gitlab001.xml | 1 | ||||
-rw-r--r-- | tests/triggers/fixtures/gitlab002.xml | 1 | ||||
-rw-r--r-- | tests/triggers/fixtures/gitlab003.xml | 1 | ||||
-rw-r--r-- | tests/triggers/fixtures/gitlab004.xml | 1 | ||||
-rw-r--r-- | tests/triggers/fixtures/gitlab005.xml | 1 | ||||
-rw-r--r-- | tests/triggers/fixtures/gitlab006.xml | 1 | ||||
-rw-r--r-- | tests/triggers/fixtures/gitlab007.xml | 1 | ||||
-rw-r--r-- | tests/triggers/fixtures/gitlab007.yaml | 1 | ||||
-rw-r--r-- | tests/triggers/fixtures/gitlab008.xml | 1 | ||||
-rw-r--r-- | tests/triggers/fixtures/gitlab008.yaml | 1 |
11 files changed, 13 insertions, 0 deletions
diff --git a/jenkins_jobs/modules/triggers.py b/jenkins_jobs/modules/triggers.py index 90f9e2ee..43128489 100644 --- a/jenkins_jobs/modules/triggers.py +++ b/jenkins_jobs/modules/triggers.py @@ -1410,6 +1410,8 @@ def gitlab(registry, xml_parent, data): (default true) :arg bool set-build-description: Set build description to build cause (eg. Merge request or Git Push) (default true) + :arg bool cancel-pending-builds-on-update: Cancel pending merge request + builds on update (default false) :arg bool add-note-merge-request: Add note with build status on merge requests (default true) :arg bool add-vote-merge-request: Vote added to note with build status @@ -1521,6 +1523,7 @@ def gitlab(registry, xml_parent, data): ("ci-skip", "ciSkip", True), ("wip-skip", "skipWorkInProgressMergeRequest", True), ("set-build-description", "setBuildDescription", True), + ("cancel-pending-builds-on-update", "cancelPendingBuildsOnUpdate", False), ("add-note-merge-request", "addNoteOnMergeRequest", True), ("add-vote-merge-request", "addVoteOnMergeRequest", True), ("accept-merge-request-on-success", "acceptMergeRequestOnSuccess", False), diff --git a/tests/triggers/fixtures/gitlab001.xml b/tests/triggers/fixtures/gitlab001.xml index 8ae8e77d..2f87069f 100644 --- a/tests/triggers/fixtures/gitlab001.xml +++ b/tests/triggers/fixtures/gitlab001.xml @@ -14,6 +14,7 @@ <ciSkip>true</ciSkip> <skipWorkInProgressMergeRequest>true</skipWorkInProgressMergeRequest> <setBuildDescription>true</setBuildDescription> + <cancelPendingBuildsOnUpdate>false</cancelPendingBuildsOnUpdate> <addNoteOnMergeRequest>true</addNoteOnMergeRequest> <addVoteOnMergeRequest>true</addVoteOnMergeRequest> <acceptMergeRequestOnSuccess>false</acceptMergeRequestOnSuccess> diff --git a/tests/triggers/fixtures/gitlab002.xml b/tests/triggers/fixtures/gitlab002.xml index 5d150f09..f92b5091 100644 --- a/tests/triggers/fixtures/gitlab002.xml +++ b/tests/triggers/fixtures/gitlab002.xml @@ -14,6 +14,7 @@ <ciSkip>true</ciSkip> <skipWorkInProgressMergeRequest>true</skipWorkInProgressMergeRequest> <setBuildDescription>true</setBuildDescription> + <cancelPendingBuildsOnUpdate>false</cancelPendingBuildsOnUpdate> <addNoteOnMergeRequest>true</addNoteOnMergeRequest> <addVoteOnMergeRequest>true</addVoteOnMergeRequest> <acceptMergeRequestOnSuccess>false</acceptMergeRequestOnSuccess> diff --git a/tests/triggers/fixtures/gitlab003.xml b/tests/triggers/fixtures/gitlab003.xml index 0dc1cdd9..907731e8 100644 --- a/tests/triggers/fixtures/gitlab003.xml +++ b/tests/triggers/fixtures/gitlab003.xml @@ -14,6 +14,7 @@ <ciSkip>true</ciSkip> <skipWorkInProgressMergeRequest>true</skipWorkInProgressMergeRequest> <setBuildDescription>true</setBuildDescription> + <cancelPendingBuildsOnUpdate>false</cancelPendingBuildsOnUpdate> <addNoteOnMergeRequest>true</addNoteOnMergeRequest> <addVoteOnMergeRequest>true</addVoteOnMergeRequest> <acceptMergeRequestOnSuccess>false</acceptMergeRequestOnSuccess> diff --git a/tests/triggers/fixtures/gitlab004.xml b/tests/triggers/fixtures/gitlab004.xml index 01101568..8ddde8e3 100644 --- a/tests/triggers/fixtures/gitlab004.xml +++ b/tests/triggers/fixtures/gitlab004.xml @@ -14,6 +14,7 @@ <ciSkip>false</ciSkip> <skipWorkInProgressMergeRequest>true</skipWorkInProgressMergeRequest> <setBuildDescription>false</setBuildDescription> + <cancelPendingBuildsOnUpdate>false</cancelPendingBuildsOnUpdate> <addNoteOnMergeRequest>false</addNoteOnMergeRequest> <addVoteOnMergeRequest>false</addVoteOnMergeRequest> <acceptMergeRequestOnSuccess>false</acceptMergeRequestOnSuccess> diff --git a/tests/triggers/fixtures/gitlab005.xml b/tests/triggers/fixtures/gitlab005.xml index 7d19cb50..6bda664d 100644 --- a/tests/triggers/fixtures/gitlab005.xml +++ b/tests/triggers/fixtures/gitlab005.xml @@ -14,6 +14,7 @@ <ciSkip>true</ciSkip> <skipWorkInProgressMergeRequest>true</skipWorkInProgressMergeRequest> <setBuildDescription>true</setBuildDescription> + <cancelPendingBuildsOnUpdate>false</cancelPendingBuildsOnUpdate> <addNoteOnMergeRequest>true</addNoteOnMergeRequest> <addVoteOnMergeRequest>true</addVoteOnMergeRequest> <acceptMergeRequestOnSuccess>false</acceptMergeRequestOnSuccess> diff --git a/tests/triggers/fixtures/gitlab006.xml b/tests/triggers/fixtures/gitlab006.xml index 5d6e5999..36b84fe6 100644 --- a/tests/triggers/fixtures/gitlab006.xml +++ b/tests/triggers/fixtures/gitlab006.xml @@ -14,6 +14,7 @@ <ciSkip>false</ciSkip> <skipWorkInProgressMergeRequest>false</skipWorkInProgressMergeRequest> <setBuildDescription>false</setBuildDescription> + <cancelPendingBuildsOnUpdate>false</cancelPendingBuildsOnUpdate> <addNoteOnMergeRequest>false</addNoteOnMergeRequest> <addVoteOnMergeRequest>false</addVoteOnMergeRequest> <acceptMergeRequestOnSuccess>true</acceptMergeRequestOnSuccess> diff --git a/tests/triggers/fixtures/gitlab007.xml b/tests/triggers/fixtures/gitlab007.xml index 4efe9509..c51382e8 100644 --- a/tests/triggers/fixtures/gitlab007.xml +++ b/tests/triggers/fixtures/gitlab007.xml @@ -14,6 +14,7 @@ <ciSkip>true</ciSkip> <skipWorkInProgressMergeRequest>true</skipWorkInProgressMergeRequest> <setBuildDescription>true</setBuildDescription> + <cancelPendingBuildsOnUpdate>false</cancelPendingBuildsOnUpdate> <addNoteOnMergeRequest>true</addNoteOnMergeRequest> <addVoteOnMergeRequest>true</addVoteOnMergeRequest> <acceptMergeRequestOnSuccess>false</acceptMergeRequestOnSuccess> diff --git a/tests/triggers/fixtures/gitlab007.yaml b/tests/triggers/fixtures/gitlab007.yaml index ac2db3c4..31bc2698 100644 --- a/tests/triggers/fixtures/gitlab007.yaml +++ b/tests/triggers/fixtures/gitlab007.yaml @@ -6,6 +6,7 @@ triggers: trigger-closed-merge-request: true ci-skip: true set-build-description: true + cancel-pending-builds-on-update: false add-note-merge-request: true add-vote-merge-request: true add-ci-message: true diff --git a/tests/triggers/fixtures/gitlab008.xml b/tests/triggers/fixtures/gitlab008.xml index a7281cc5..2e4962d0 100644 --- a/tests/triggers/fixtures/gitlab008.xml +++ b/tests/triggers/fixtures/gitlab008.xml @@ -14,6 +14,7 @@ <ciSkip>false</ciSkip> <skipWorkInProgressMergeRequest>true</skipWorkInProgressMergeRequest> <setBuildDescription>false</setBuildDescription> + <cancelPendingBuildsOnUpdate>true</cancelPendingBuildsOnUpdate> <addNoteOnMergeRequest>false</addNoteOnMergeRequest> <addVoteOnMergeRequest>false</addVoteOnMergeRequest> <acceptMergeRequestOnSuccess>false</acceptMergeRequestOnSuccess> diff --git a/tests/triggers/fixtures/gitlab008.yaml b/tests/triggers/fixtures/gitlab008.yaml index bad401fb..9dd8ba9e 100644 --- a/tests/triggers/fixtures/gitlab008.yaml +++ b/tests/triggers/fixtures/gitlab008.yaml @@ -5,6 +5,7 @@ triggers: trigger-open-merge-request-push: both ci-skip: false set-build-description: false + cancel-pending-builds-on-update: true add-note-merge-request: false add-vote-merge-request: false add-ci-message: true |