jjb
/
jenkins-job-builder
Code Issues Proposed changes

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
This commit is contained in:
Christoph Erhardt 2020-04-16 16:56:50 +02:00
parent 9cff4f295e
commit 03d99c56e8
11 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jenkins_jobs/modules/triggers.py
View File

@ -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),

1
tests/triggers/fixtures/gitlab001.xml
View File

@ -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>

1
tests/triggers/fixtures/gitlab002.xml
View File

@ -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>

1
tests/triggers/fixtures/gitlab003.xml
View File

@ -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>

1
tests/triggers/fixtures/gitlab004.xml
View File

@ -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>

1
tests/triggers/fixtures/gitlab005.xml
View File

@ -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>

1
tests/triggers/fixtures/gitlab006.xml
View File

@ -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>

1
tests/triggers/fixtures/gitlab007.xml
View File

@ -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>

1
tests/triggers/fixtures/gitlab007.yaml
View File

@ -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

1
tests/triggers/fixtures/gitlab008.xml
View File

@ -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>

1
tests/triggers/fixtures/gitlab008.yaml
View File

@ -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