Merge "Add parameter "cancel-pending-builds-on-update" for trigger "gitlab""

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

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>

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>

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>

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>

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>

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>

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>

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

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>

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