diff --git a/jenkins_jobs/modules/triggers.py b/jenkins_jobs/modules/triggers.py index 276164fbc..0ddef3ff8 100644 --- a/jenkins_jobs/modules/triggers.py +++ b/jenkins_jobs/modules/triggers.py @@ -1049,6 +1049,7 @@ def gitlab(parser, xml_parent, data): merge requests (default: True) :arg bool add-vote-merge-request: Vote added to note with build status on merge requests (default: True) + :arg bool add-ci-message: Add CI build status (default: False) :arg bool allow-all-branches: Allow all branches (Ignoring Filtered Branches) (default: False) :arg list include-branches: Defined list of branches to include @@ -1077,6 +1078,7 @@ def gitlab(parser, xml_parent, data): ('set-build-description', 'setBuildDescription', True), ('add-note-merge-request', 'addNoteOnMergeRequest', True), ('add-vote-merge-request', 'addVoteOnMergeRequest', True), + ('add-ci-message', 'addCiMessage', False), ('allow-all-branches', 'allowAllBranches', False), ) list_mapping = ( diff --git a/tests/triggers/fixtures/gitlab001.xml b/tests/triggers/fixtures/gitlab001.xml index 717eed400..d01b4c91f 100644 --- a/tests/triggers/fixtures/gitlab001.xml +++ b/tests/triggers/fixtures/gitlab001.xml @@ -10,6 +10,7 @@ true true true + true true master, master2, local-test broken-test, master-foo diff --git a/tests/triggers/fixtures/gitlab001.yaml b/tests/triggers/fixtures/gitlab001.yaml index 9df33b9d6..5655c08a5 100644 --- a/tests/triggers/fixtures/gitlab001.yaml +++ b/tests/triggers/fixtures/gitlab001.yaml @@ -7,6 +7,7 @@ triggers: set-build-description: true add-note-merge-request: true add-vote-merge-request: true + add-ci-message: true allow-all-branches: true include-branches: - 'master' diff --git a/tests/triggers/fixtures/gitlab002.xml b/tests/triggers/fixtures/gitlab002.xml index bf4502fd7..6d9442f97 100644 --- a/tests/triggers/fixtures/gitlab002.xml +++ b/tests/triggers/fixtures/gitlab002.xml @@ -10,6 +10,7 @@ true true true + false false master feature diff --git a/tests/triggers/fixtures/gitlab003.xml b/tests/triggers/fixtures/gitlab003.xml index 5988252bb..f3ad460ef 100644 --- a/tests/triggers/fixtures/gitlab003.xml +++ b/tests/triggers/fixtures/gitlab003.xml @@ -10,9 +10,10 @@ true true true + false false master baz, foo, fnord - \ No newline at end of file +