Merge "Add support for aggregated test results"
This commit is contained in:
commit
53d100458d
@ -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)
|
||||
|
@ -19,6 +19,7 @@
|
||||
</hudson.plugins.git.GitRevisionBuildParameters>
|
||||
</configs>
|
||||
<abortAllJob>true</abortAllJob>
|
||||
<aggregatedTestResults>false</aggregatedTestResults>
|
||||
<enableRetryStrategy>false</enableRetryStrategy>
|
||||
</com.tikal.jenkins.plugins.multijob.PhaseJobsConfig>
|
||||
<com.tikal.jenkins.plugins.multijob.PhaseJobsConfig>
|
||||
@ -31,6 +32,7 @@
|
||||
</hudson.plugins.parameterizedtrigger.FileBuildParameters>
|
||||
</configs>
|
||||
<abortAllJob>false</abortAllJob>
|
||||
<aggregatedTestResults>false</aggregatedTestResults>
|
||||
<enableRetryStrategy>false</enableRetryStrategy>
|
||||
</com.tikal.jenkins.plugins.multijob.PhaseJobsConfig>
|
||||
</phaseJobs>
|
||||
@ -50,6 +52,7 @@
|
||||
</hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
|
||||
</configs>
|
||||
<abortAllJob>false</abortAllJob>
|
||||
<aggregatedTestResults>true</aggregatedTestResults>
|
||||
<enableRetryStrategy>false</enableRetryStrategy>
|
||||
</com.tikal.jenkins.plugins.multijob.PhaseJobsConfig>
|
||||
<com.tikal.jenkins.plugins.multijob.PhaseJobsConfig>
|
||||
@ -61,6 +64,7 @@
|
||||
</hudson.plugins.parameterizedtrigger.matrix.MatrixSubsetBuildParameters>
|
||||
</configs>
|
||||
<abortAllJob>false</abortAllJob>
|
||||
<aggregatedTestResults>false</aggregatedTestResults>
|
||||
<enableRetryStrategy>false</enableRetryStrategy>
|
||||
<enableCondition>true</enableCondition>
|
||||
<condition>${BUILDNUMBER} % 2 == 1</condition>
|
||||
@ -78,6 +82,7 @@
|
||||
<currParams>true</currParams>
|
||||
<configs/>
|
||||
<abortAllJob>false</abortAllJob>
|
||||
<aggregatedTestResults>false</aggregatedTestResults>
|
||||
<enableRetryStrategy>false</enableRetryStrategy>
|
||||
<killPhaseOnJobResultCondition>FAILURE</killPhaseOnJobResultCondition>
|
||||
</com.tikal.jenkins.plugins.multijob.PhaseJobsConfig>
|
||||
@ -93,6 +98,7 @@
|
||||
<currParams>false</currParams>
|
||||
<configs/>
|
||||
<abortAllJob>false</abortAllJob>
|
||||
<aggregatedTestResults>false</aggregatedTestResults>
|
||||
<parsingRulesPath>/PhaseFour/PhaseFourRetry.prop</parsingRulesPath>
|
||||
<maxRetries>3</maxRetries>
|
||||
<enableRetryStrategy>true</enableRetryStrategy>
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user