Skip to content

Commit 2988ca0

Browse files
authored
Set parent job status to ABORTED if one of the parallel branches status (#6612)
is ABORTED. ABORTED jobs won't be triggered rerun automatically. It's possible that TAP file is not generated or archived, which can cause unstable rerun job doesn't have failed testcases of aborted job at all. This avoids parent job status is wrongly marked as SUCCESS due to the SUCCESS status of rerun job. Signed-off-by: Sophia Guo <[email protected]>
1 parent a1519b4 commit 2988ca0

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

buildenv/jenkins/JenkinsfileBase

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,6 +1584,9 @@ def triggerRerunJob (String originalStatus, Map rerunTestJobParams = null) {
15841584
def rerunResults = archiveChildJobTap(childJobs, originalStatus)
15851585
if (env.JDK_IMPL == "openj9" || env.JDK_IMPL == "ibm") {
15861586
currentBuild.result = originalStatus
1587+
} else if ( originalStatus == 'ABORTED') {
1588+
// Set job status to the worst result among its parallel branches including rerun branch.
1589+
currentBuild.result = originalStatus
15871590
} else {
15881591
currentBuild.result = rerunResults.jobStatus
15891592
}

0 commit comments

Comments
 (0)