From 4b2c27610bc5ad6513fb9d7446d62f70325c153a Mon Sep 17 00:00:00 2001 From: Sophia Guo Date: Mon, 6 May 2024 16:31:29 -0400 Subject: [PATCH 1/4] Archive rerun tap files Signed-off-by: Sophia Guo --- buildenv/jenkins/JenkinsfileBase | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase index f33a0e9d6a..8310a0c424 100644 --- a/buildenv/jenkins/JenkinsfileBase +++ b/buildenv/jenkins/JenkinsfileBase @@ -1347,7 +1347,23 @@ def triggerRerunJob () { } if (childParams) { - build job: rerunJobName, parameters: childParams, propagate: false + def rerunJob = build job: rerunJobName, parameters: childParams, propagate: false + def jobResult = rerunJob.getResult() + def buildId = rerunJob.getNumber() + try { + echo "${rerunJobName} #${buildId} completed with status ${jobResult}" + timeout(time: 1, unit: 'HOURS') { + copyArtifacts (projectName: "${rerunJobName}", + selector: specific("${buildId}"), + filter: "**/*.tap", + target:"${rerunJobName}/${buildId}") + } + step([$class: "TapPublisher", testResults: "${name}/${buildId}/**/*.tap", outputTapToConsole: false, failIfNoResults: true]) + archiveFile("${name}/${buildId}/**/*.tap", true) + } catch (Exception e) { + echo 'Exception: ' + e.toString() + echo "Cannot copy *.tap from ${rerunJobName} with buildid ${buildId} . Skipping copyArtifacts..." + } } } } From 7650a0569f0273a2ca6c2a2cb74d22c8eb3bb621 Mon Sep 17 00:00:00 2001 From: Sophia Guo Date: Mon, 6 May 2024 23:51:25 -0400 Subject: [PATCH 2/4] Cleanup Signed-off-by: Sophia Guo --- buildenv/jenkins/JenkinsfileBase | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase index 8310a0c424..d3b88b15c7 100644 --- a/buildenv/jenkins/JenkinsfileBase +++ b/buildenv/jenkins/JenkinsfileBase @@ -1350,19 +1350,28 @@ def triggerRerunJob () { def rerunJob = build job: rerunJobName, parameters: childParams, propagate: false def jobResult = rerunJob.getResult() def buildId = rerunJob.getNumber() - try { - echo "${rerunJobName} #${buildId} completed with status ${jobResult}" + echo "${rerunJobName} #${buildId} completed with status ${jobResult}" + node (env.SETUP_LABEL) { timeout(time: 1, unit: 'HOURS') { - copyArtifacts (projectName: "${rerunJobName}", - selector: specific("${buildId}"), - filter: "**/*.tap", - target:"${rerunJobName}/${buildId}") + try { + copyArtifacts (projectName: "${rerunJobName}", + selector: specific("${buildId}"), + filter: "**/*.tap", + target:"${rerunJobName}/${buildId}") + } catch (Exception e) { + echo 'Exception: ' + e.toString() + echo "Cannot copy *.tap from ${rerunJobName} with buildid ${buildId} . Skipping copyArtifacts..." + } + + try { + step([$class: "TapPublisher", testResults: "${rerunJobName}/${buildId}/**/*.tap", outputTapToConsole: false, failIfNoResults: true]) + archiveFile("${rerunJobName}/${buildId}/**/*.tap", true) + } catch (Exception e) { + echo 'Exception: ' + e.toString() + echo "Cannot archive tap files from ${rerunJobName} with buildid ${buildId}. Exit ..." + } } - step([$class: "TapPublisher", testResults: "${name}/${buildId}/**/*.tap", outputTapToConsole: false, failIfNoResults: true]) - archiveFile("${name}/${buildId}/**/*.tap", true) - } catch (Exception e) { - echo 'Exception: ' + e.toString() - echo "Cannot copy *.tap from ${rerunJobName} with buildid ${buildId} . Skipping copyArtifacts..." + } } } From 3c25c9123db3f18c78795703297e2513f771e8f2 Mon Sep 17 00:00:00 2001 From: sophia-guo Date: Wed, 8 May 2024 09:51:11 -0400 Subject: [PATCH 3/4] Update buildenv/jenkins/JenkinsfileBase Co-authored-by: Martijn Verburg --- buildenv/jenkins/JenkinsfileBase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase index d3b88b15c7..6736024116 100644 --- a/buildenv/jenkins/JenkinsfileBase +++ b/buildenv/jenkins/JenkinsfileBase @@ -1360,7 +1360,7 @@ def triggerRerunJob () { target:"${rerunJobName}/${buildId}") } catch (Exception e) { echo 'Exception: ' + e.toString() - echo "Cannot copy *.tap from ${rerunJobName} with buildid ${buildId} . Skipping copyArtifacts..." + echo "Cannot copy *.tap from ${rerunJobName} with build id ${buildId} . Skipping copyArtifacts..." } try { From b3f42b72be789929bc79bef04ea4b5bb2d99fc30 Mon Sep 17 00:00:00 2001 From: sophia-guo Date: Wed, 8 May 2024 09:51:16 -0400 Subject: [PATCH 4/4] Update buildenv/jenkins/JenkinsfileBase Co-authored-by: Martijn Verburg --- buildenv/jenkins/JenkinsfileBase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase index 6736024116..88f5826815 100644 --- a/buildenv/jenkins/JenkinsfileBase +++ b/buildenv/jenkins/JenkinsfileBase @@ -1368,7 +1368,7 @@ def triggerRerunJob () { archiveFile("${rerunJobName}/${buildId}/**/*.tap", true) } catch (Exception e) { echo 'Exception: ' + e.toString() - echo "Cannot archive tap files from ${rerunJobName} with buildid ${buildId}. Exit ..." + echo "Cannot archive tap files from ${rerunJobName} with build id ${buildId}. Exit ..." } }