From c7bc72b7a28db36dfb0df6d7d1159387f0f2d5f4 Mon Sep 17 00:00:00 2001
From: Tomas Turek <tturek@redhat.com>
Date: Fri, 17 Jun 2016 10:48:11 +0200
Subject: [PATCH] Adds support rerun matrix part to the naginator

Change-Id: I125d6966100b098ad3a49bd404d2f79c7b7471a1
Signed-off-by: Tomas Turek <osmman@gmail.com>
---
 jenkins_jobs/modules/publishers.py          | 4 ++++
 tests/publishers/fixtures/naginator001.xml  | 1 +
 tests/publishers/fixtures/naginator001.yaml | 1 +
 tests/publishers/fixtures/naginator002.xml  | 1 +
 tests/publishers/fixtures/naginator003.xml  | 1 +
 5 files changed, 8 insertions(+)

diff --git a/jenkins_jobs/modules/publishers.py b/jenkins_jobs/modules/publishers.py
index 1a583bfa2..690b39d1c 100644
--- a/jenkins_jobs/modules/publishers.py
+++ b/jenkins_jobs/modules/publishers.py
@@ -5313,6 +5313,8 @@ def naginator(parser, xml_parent, data):
 
     :arg bool rerun-unstable-builds: Rerun build for unstable builds as well
         as failures (default false)
+    :arg bool rerun-matrix-part: Rerun build only for failed parts on the
+        matrix (>=1.12) (default false)
     :arg int fixed-delay: Fixed delay before retrying build (cannot be used
         with progressive-delay-increment or progressive-delay-maximum.
         This is the default delay type.  (default 0)
@@ -5341,6 +5343,8 @@ def naginator(parser, xml_parent, data):
         'regular-expression' in data).lower()
     XML.SubElement(naginator, 'rerunIfUnstable').text = str(
         data.get('rerun-unstable-builds', False)).lower()
+    XML.SubElement(naginator, 'rerunMatrixPart').text = str(
+        data.get('rerun-matrix-part', False)).lower()
     progressive_delay = ('progressive-delay-increment' in data or
                          'progressive-delay-maximum' in data)
     if 'fixed-delay' in data and progressive_delay:
diff --git a/tests/publishers/fixtures/naginator001.xml b/tests/publishers/fixtures/naginator001.xml
index 59caf8460..ead48a445 100644
--- a/tests/publishers/fixtures/naginator001.xml
+++ b/tests/publishers/fixtures/naginator001.xml
@@ -5,6 +5,7 @@
       <regexpForRerun>foo</regexpForRerun>
       <checkRegexp>true</checkRegexp>
       <rerunIfUnstable>true</rerunIfUnstable>
+      <rerunMatrixPart>true</rerunMatrixPart>
       <delay class="com.chikli.hudson.plugin.naginator.ProgressiveDelay">
         <increment>5</increment>
         <max>15</max>
diff --git a/tests/publishers/fixtures/naginator001.yaml b/tests/publishers/fixtures/naginator001.yaml
index 997b312e0..eb31c5585 100644
--- a/tests/publishers/fixtures/naginator001.yaml
+++ b/tests/publishers/fixtures/naginator001.yaml
@@ -1,6 +1,7 @@
 publishers:
   - naginator:
       rerun-unstable-builds: true
+      rerun-matrix-part: true
       progressive-delay-increment: 5
       progressive-delay-maximum: 15
       max-failed-builds: 6
diff --git a/tests/publishers/fixtures/naginator002.xml b/tests/publishers/fixtures/naginator002.xml
index 40c4b196b..ba082f1fb 100644
--- a/tests/publishers/fixtures/naginator002.xml
+++ b/tests/publishers/fixtures/naginator002.xml
@@ -5,6 +5,7 @@
       <regexpForRerun/>
       <checkRegexp>false</checkRegexp>
       <rerunIfUnstable>false</rerunIfUnstable>
+      <rerunMatrixPart>false</rerunMatrixPart>
       <delay class="com.chikli.hudson.plugin.naginator.FixedDelay">
         <delay>0</delay>
       </delay>
diff --git a/tests/publishers/fixtures/naginator003.xml b/tests/publishers/fixtures/naginator003.xml
index fda19a3cd..5bf74d953 100644
--- a/tests/publishers/fixtures/naginator003.xml
+++ b/tests/publishers/fixtures/naginator003.xml
@@ -5,6 +5,7 @@
       <regexpForRerun/>
       <checkRegexp>false</checkRegexp>
       <rerunIfUnstable>false</rerunIfUnstable>
+      <rerunMatrixPart>false</rerunMatrixPart>
       <delay class="com.chikli.hudson.plugin.naginator.FixedDelay">
         <delay>30</delay>
       </delay>