gitlab trigger: Support new "addCiMessage" flag

Change-Id: I784bd2f11e8371d951b6eb302eecaab0110c8c2b
Signed-off-by: Christian Hofstaedtler <christian.hofstaedtler@deduktiva.com>

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 = (

tests/triggers/fixtures/gitlab001.xml

@@ -10,6 +10,7 @@
       <setBuildDescription>true</setBuildDescription>
       <addNoteOnMergeRequest>true</addNoteOnMergeRequest>
       <addVoteOnMergeRequest>true</addVoteOnMergeRequest>
+      <addCiMessage>true</addCiMessage>
       <allowAllBranches>true</allowAllBranches>
       <includeBranchesSpec>master, master2, local-test</includeBranchesSpec>
       <excludeBranchesSpec>broken-test, master-foo</excludeBranchesSpec>

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'

tests/triggers/fixtures/gitlab002.xml

@@ -10,6 +10,7 @@
       <setBuildDescription>true</setBuildDescription>
       <addNoteOnMergeRequest>true</addNoteOnMergeRequest>
       <addVoteOnMergeRequest>true</addVoteOnMergeRequest>
+      <addCiMessage>false</addCiMessage>
       <allowAllBranches>false</allowAllBranches>
       <includeBranchesSpec>master</includeBranchesSpec>
       <excludeBranchesSpec>feature</excludeBranchesSpec>

tests/triggers/fixtures/gitlab003.xml

@@ -10,9 +10,10 @@
       <setBuildDescription>true</setBuildDescription>
       <addNoteOnMergeRequest>true</addNoteOnMergeRequest>
       <addVoteOnMergeRequest>true</addVoteOnMergeRequest>
+      <addCiMessage>false</addCiMessage>
       <allowAllBranches>false</allowAllBranches>
       <includeBranchesSpec>master</includeBranchesSpec>
       <excludeBranchesSpec>baz, foo, fnord</excludeBranchesSpec>
     </com.dabsquared.gitlabjenkins.GitLabPushTrigger>
   </triggers>
-</project>
+</project>