summaryrefslogtreecommitdiffstats
path: root/jenkins_jobs
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-04-20 12:49:56 +0000
committerGerrit Code Review <review@openstack.org>2020-04-20 12:49:56 +0000
commit73a63eb4fe75c360c6f57d2706e32a9287435bb3 (patch)
treeafd609a0c06aabb19d8dd4c3761c46abe45d0314 /jenkins_jobs
parentd24fb9ddd5a4b7d9beba19099ef6e5838db369e5 (diff)
parent03d99c56e8b728409ee82c2ae24d18e88ed5ce0f (diff)
downloadpython-jenkins-job-builder-73a63eb4fe75c360c6f57d2706e32a9287435bb3.tar.gz
python-jenkins-job-builder-73a63eb4fe75c360c6f57d2706e32a9287435bb3.tar.xz
python-jenkins-job-builder-73a63eb4fe75c360c6f57d2706e32a9287435bb3.zip
Merge "Add parameter "cancel-pending-builds-on-update" for trigger "gitlab""
Diffstat (limited to 'jenkins_jobs')
-rw-r--r--jenkins_jobs/modules/triggers.py3
1 files changed, 3 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),