Merge "Added notbuilt-message option to gerrit trigger"

jenkins_jobs/modules/triggers.py

@@ -149,6 +149,7 @@ def gerrit(parser, xml_parent, data):
     :arg str failure-message: Message to leave on failure (default '')
     :arg str successful-message: Message to leave on success (default '')
     :arg str unstable-message: Message to leave when unstable (default '')
+    :arg str notbuilt-message: Message to leave when not built (default '')
     :arg list projects: list of projects to match
 
       :Project: * **project-compare-type** (`str`) --  ''PLAIN'', ''ANT'' or
@@ -331,6 +332,8 @@ def gerrit(parser, xml_parent, data):
         data.get('successful-message', ''))
     XML.SubElement(gtrig, 'buildUnstableMessage').text = str(
         data.get('unstable-message', ''))
+    XML.SubElement(gtrig, 'buildNotBuiltMessage').text = str(
+        data.get('notbuilt-message', ''))
     XML.SubElement(gtrig, 'customUrl').text = str(data.get('custom-url', ''))
     XML.SubElement(gtrig, 'serverName').text = str(
         data.get('server-name', '__ANY__'))

tests/triggers/fixtures/gerrit001.xml

@@ -43,6 +43,7 @@
       <buildFailureMessage/>
       <buildSuccessfulMessage/>
       <buildUnstableMessage/>
+      <buildNotBuiltMessage/>
       <customUrl/>
       <serverName>__ANY__</serverName>
     </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>

tests/triggers/fixtures/gerrit002.xml

@@ -47,6 +47,7 @@
       <buildFailureMessage/>
       <buildSuccessfulMessage/>
       <buildUnstableMessage/>
+      <buildNotBuiltMessage/>
       <customUrl/>
       <serverName>__ANY__</serverName>
     </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>

tests/triggers/fixtures/gerrit003.xml

@@ -63,6 +63,7 @@
       <buildFailureMessage/>
       <buildSuccessfulMessage/>
       <buildUnstableMessage/>
+      <buildNotBuiltMessage/>
       <customUrl/>
       <serverName>__ANY__</serverName>
     </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>

tests/triggers/fixtures/gerrit004.xml

@@ -53,6 +53,7 @@
       <buildFailureMessage/>
       <buildSuccessfulMessage/>
       <buildUnstableMessage/>
+      <buildNotBuiltMessage/>
       <customUrl/>
       <serverName>my-server</serverName>
     </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>

tests/yamlparser/fixtures/complete001.xml

@@ -82,6 +82,7 @@
       <buildFailureMessage>This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.</buildFailureMessage>
       <buildSuccessfulMessage/>
       <buildUnstableMessage/>
+      <buildNotBuiltMessage/>
       <customUrl/>
       <serverName>__ANY__</serverName>
     </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>