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 @@ foo true true + true 5 15 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 @@ false false + false 0 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 @@ false false + false 30