jjb/jenkins-job-builder
Code Issues Proposed changes

STORY: 2009994

Browse Source 
add support triggerOnlyIfNewCommitsPushed option

Change-Id: I1e777bdd47d7cd93839c6edde6f75737972c242a
This commit is contained in:
Max Trunov 2022-04-15 10:12:54 +05:00
parent fc4985e63d
commit 0fdb576ee5
11 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jenkins_jobs/modules/triggers.py
View File

@ -1638,6 +1638,9 @@ def gitlab(registry, xml_parent, data):
* **never** (default)
* **source**
* **both**
:arg bool trigger-only-if-new-commits-pushed: Trigger a build on commits pushed
only, but not trigger on another MR changes(label, edit, assign, etc)
(>=1.5.17)(default false)
:arg bool trigger-note: Build when comment is added with defined phrase
(>= 1.2.4) (default true)
:arg str note-regex: Phrase that triggers the build (>= 1.2.4) (default
@ -1755,6 +1758,7 @@ def gitlab(registry, xml_parent, data):
mapping = [
("trigger-push", "triggerOnPush", True),
("trigger-merge-request", "triggerOnMergeRequest", True),
("trigger-only-if-new-commits-pushed", "triggerOnlyIfNewCommitsPushed", False),
("trigger-accepted-merge-request", "triggerOnAcceptedMergeRequest", False),
("trigger-closed-merge-request", "triggerOnClosedMergeRequest", False),
("trigger-note", "triggerOnNoteRequest", True),

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

@ -7,6 +7,7 @@
<spec/>
<triggerOnPush>true</triggerOnPush>
<triggerOnMergeRequest>true</triggerOnMergeRequest>
<triggerOnlyIfNewCommitsPushed>false</triggerOnlyIfNewCommitsPushed>
<triggerOnAcceptedMergeRequest>false</triggerOnAcceptedMergeRequest>
<triggerOnClosedMergeRequest>false</triggerOnClosedMergeRequest>
<triggerOnNoteRequest>true</triggerOnNoteRequest>

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

@ -7,6 +7,7 @@
<spec/>
<triggerOnPush>true</triggerOnPush>
<triggerOnMergeRequest>true</triggerOnMergeRequest>
<triggerOnlyIfNewCommitsPushed>false</triggerOnlyIfNewCommitsPushed>
<triggerOnAcceptedMergeRequest>false</triggerOnAcceptedMergeRequest>
<triggerOnClosedMergeRequest>false</triggerOnClosedMergeRequest>
<triggerOnNoteRequest>true</triggerOnNoteRequest>

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

@ -7,6 +7,7 @@
<spec/>
<triggerOnPush>true</triggerOnPush>
<triggerOnMergeRequest>true</triggerOnMergeRequest>
<triggerOnlyIfNewCommitsPushed>false</triggerOnlyIfNewCommitsPushed>
<triggerOnAcceptedMergeRequest>false</triggerOnAcceptedMergeRequest>
<triggerOnClosedMergeRequest>false</triggerOnClosedMergeRequest>
<triggerOnNoteRequest>true</triggerOnNoteRequest>

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

@ -7,6 +7,7 @@
<spec/>
<triggerOnPush>false</triggerOnPush>
<triggerOnMergeRequest>false</triggerOnMergeRequest>
<triggerOnlyIfNewCommitsPushed>false</triggerOnlyIfNewCommitsPushed>
<triggerOnAcceptedMergeRequest>false</triggerOnAcceptedMergeRequest>
<triggerOnClosedMergeRequest>false</triggerOnClosedMergeRequest>
<triggerOnNoteRequest>true</triggerOnNoteRequest>

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

@ -2,6 +2,7 @@ triggers:
- gitlab:
trigger-push: false
trigger-merge-request: false
trigger-only-if-new-commits-pushed: false
trigger-open-merge-request-push: both
ci-skip: false
set-build-description: false

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

@ -7,6 +7,7 @@
<spec/>
<triggerOnPush>true</triggerOnPush>
<triggerOnMergeRequest>true</triggerOnMergeRequest>
<triggerOnlyIfNewCommitsPushed>false</triggerOnlyIfNewCommitsPushed>
<triggerOnAcceptedMergeRequest>false</triggerOnAcceptedMergeRequest>
<triggerOnClosedMergeRequest>false</triggerOnClosedMergeRequest>
<triggerOnNoteRequest>true</triggerOnNoteRequest>

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

@ -7,6 +7,7 @@
<spec/>
<triggerOnPush>false</triggerOnPush>
<triggerOnMergeRequest>false</triggerOnMergeRequest>
<triggerOnlyIfNewCommitsPushed>false</triggerOnlyIfNewCommitsPushed>
<triggerOnAcceptedMergeRequest>false</triggerOnAcceptedMergeRequest>
<triggerOnClosedMergeRequest>false</triggerOnClosedMergeRequest>
<triggerOnNoteRequest>true</triggerOnNoteRequest>

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

@ -7,6 +7,7 @@
<spec/>
<triggerOnPush>true</triggerOnPush>
<triggerOnMergeRequest>true</triggerOnMergeRequest>
<triggerOnlyIfNewCommitsPushed>true</triggerOnlyIfNewCommitsPushed>
<triggerOnAcceptedMergeRequest>true</triggerOnAcceptedMergeRequest>
<triggerOnClosedMergeRequest>true</triggerOnClosedMergeRequest>
<triggerOnNoteRequest>true</triggerOnNoteRequest>

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

@ -2,6 +2,7 @@ triggers:
- gitlab:
trigger-push: true
trigger-merge-request: true
trigger-only-if-new-commits-pushed: true
trigger-accepted-merge-request: true
trigger-closed-merge-request: true
ci-skip: true

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

@ -7,6 +7,7 @@
<spec/>
<triggerOnPush>false</triggerOnPush>
<triggerOnMergeRequest>false</triggerOnMergeRequest>
<triggerOnlyIfNewCommitsPushed>false</triggerOnlyIfNewCommitsPushed>
<triggerOnAcceptedMergeRequest>false</triggerOnAcceptedMergeRequest>
<triggerOnClosedMergeRequest>false</triggerOnClosedMergeRequest>
<triggerOnNoteRequest>true</triggerOnNoteRequest>