diff --git a/jenkins_jobs/modules/builders.py b/jenkins_jobs/modules/builders.py index 98bdbeacd..8ce3b4461 100644 --- a/jenkins_jobs/modules/builders.py +++ b/jenkins_jobs/modules/builders.py @@ -1905,6 +1905,8 @@ def multijob(registry, xml_parent, data): parameters to the other job (optional) * **abort-all-job** (`bool`) -- Kill allsubs job and the phase job, if this subjob is killed (default false) + * **aggregate-results** (`bool`) -- Aggregate test results. + (default false) * **enable-condition** (`str`) -- Condition to run the job in groovy script format (optional) * **kill-phase-on** (`str`) -- Stop the phase execution @@ -1997,10 +1999,11 @@ def multijob(registry, xml_parent, data): mapping = [('', 'properties', predefined_parameters)] convert_mapping_to_xml(param, project, mapping, fail_required=True) - # Abort all other job - mapping = [('abort-all-job', 'abortAllJob', False)] - convert_mapping_to_xml(phaseJob, - project, mapping, fail_required=True) + mapping = [ + ('abort-all-job', 'abortAllJob', False), + ('aggregate-results', 'aggregatedTestResults', False), + ] + convert_mapping_to_xml(phaseJob, project, mapping, fail_required=True) # Retry job retry = project.get('retry', False) diff --git a/tests/builders/fixtures/multibuild.xml b/tests/builders/fixtures/multibuild.xml index 2cc75df35..907a35f7d 100644 --- a/tests/builders/fixtures/multibuild.xml +++ b/tests/builders/fixtures/multibuild.xml @@ -19,6 +19,7 @@ true + false false @@ -31,6 +32,7 @@ false + false false @@ -50,6 +52,7 @@ false + true false @@ -61,6 +64,7 @@ false + false false true ${BUILDNUMBER} % 2 == 1 @@ -78,6 +82,7 @@ true false + false false FAILURE @@ -93,6 +98,7 @@ false false + false /PhaseFour/PhaseFourRetry.prop 3 true diff --git a/tests/builders/fixtures/multibuild.yaml b/tests/builders/fixtures/multibuild.yaml index c43bb2983..3fcdf1113 100644 --- a/tests/builders/fixtures/multibuild.yaml +++ b/tests/builders/fixtures/multibuild.yaml @@ -22,6 +22,7 @@ builders: current-parameters: true predefined-parameters: foo=bar node-parameters: true + aggregate-results: true - name: PhaseTwoJobB current-parameters: false kill-phase-on: UNSTABLE