Skip to content

Commit 6ac67c0

Browse files
authored
Set parent result based on child result (#4255)
- fix the false positive issue caused by TAP parser Fixes #4237 Signed-off-by: renfeiw <[email protected]>
1 parent 52caa06 commit 6ac67c0

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

buildenv/jenkins/JenkinsfileBase

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,6 @@ def run_parallel_tests() {
11071107
// cleanWs() does not work in some cases, so set opts below
11081108
cleanWs disableDeferredWipeout: true, deleteDirs: true
11091109
try {
1110-
def buildResult = ""
11111110
def buildPaths = ""
11121111
childJobs.each {
11131112
cjob ->
@@ -1126,12 +1125,10 @@ def run_parallel_tests() {
11261125
} catch (Exception e) {
11271126
echo 'Exception: ' + e.toString()
11281127
echo "Cannot copy *.tap or AQACert.log from ${name} with buildid ${buildId} . Skipping copyArtifacts..."
1129-
buildResult = childResult
11301128
}
1131-
}
1132-
if (buildResult) {
1133-
echo "set build status to ${buildResult}"
1134-
currentBuild.result = buildResult
1129+
if (!currentBuild.resultIsWorseOrEqualTo(childResult)) {
1130+
currentBuild.result = childResult;
1131+
}
11351132
}
11361133
archiveAQAvitFiles()
11371134
if (buildPaths.length() > 0) {

0 commit comments

Comments
 (0)