From 8da98bf401ec71c9d3f8c02fd89348a31997cee3 Mon Sep 17 00:00:00 2001 From: Adam Farley Date: Mon, 6 Jan 2025 13:07:20 +0000 Subject: [PATCH 1/3] Amending the publish output url so we can find the job output Signed-off-by: Adam Farley --- tools/nightly_build_and_test_stats.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/nightly_build_and_test_stats.groovy b/tools/nightly_build_and_test_stats.groovy index b8d530d86..f1e690746 100644 --- a/tools/nightly_build_and_test_stats.groovy +++ b/tools/nightly_build_and_test_stats.groovy @@ -224,7 +224,7 @@ def getBuildIDsByPlatform(String trssUrl, String jdkVersion, String srcTag, Map if (onePipelineBuild.buildName.contains("refactor_openjdk_release_tool") && onePipelineBuild.status.contains("Done")) { def wgetUrlForReleaseTool = "${onePipelineBuild.buildUrl}/consoleText" if (onePipelineBuild.buildOutputId != null) { - wgetUrlForReleaseTool = "${trssURL}/api/getOutputById?id=${onePipelineBuild.buildOutputId}" + wgetUrlForReleaseTool = "${onePipelineBuild.url}/job/${onePipelineBuild.buildName}/${onePipelineBuild.buildNum}/consoleText" } def releaseToolOutput = callWgetSafely(wgetUrlForReleaseTool) From 92fe6dd2d92f113946d46d43be4ace7b186eb90f Mon Sep 17 00:00:00 2001 From: Adam Farley Date: Mon, 6 Jan 2025 15:17:50 +0000 Subject: [PATCH 2/3] Tweaking code that checks for empty tip releases Signed-off-by: Adam Farley --- tools/nightly_build_and_test_stats.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/nightly_build_and_test_stats.groovy b/tools/nightly_build_and_test_stats.groovy index f1e690746..5f41d78b9 100644 --- a/tools/nightly_build_and_test_stats.groovy +++ b/tools/nightly_build_and_test_stats.groovy @@ -677,7 +677,7 @@ node('worker') { } // Check tip_releases status, by querying binaries repo as API does not server the "tip" dev releases - if (tipReleases.size() > 0) { + if ("${params.TIP_RELEASES}".trim() != "") { tipReleases.each { tipRelease -> def latestOpenjdkBuild = getLatestOpenjdkBuildTag(tipRelease) def tipVersion = tipRelease.replaceAll("[a-z]","").toInteger() @@ -708,7 +708,7 @@ node('worker') { def pipelinesOfInterest = "" def allReleases = [] allReleases.addAll(featureReleases) - if (tipReleases.size() > 0) { + if ("${params.TIP_RELEASES}".trim() != "") { allReleases.addAll(tipReleases) } if ("${params.NON_TAG_BUILD_RELEASES}".trim() != "") { @@ -911,7 +911,7 @@ node('worker') { echo '-------------- Latest pipeline health report ------------------' def allReleases = [] allReleases.addAll(featureReleases) - if (tipReleases.size() > 0) { + if ("${params.TIP_RELEASES}".trim() != "") { allReleases.addAll(tipReleases) } if (("${params.NON_TAG_BUILD_RELEASES}".trim() != "")) { From f053572f1ea49c340ca270c5a659b5998770320f Mon Sep 17 00:00:00 2001 From: Adam Farley Date: Mon, 6 Jan 2025 15:32:20 +0000 Subject: [PATCH 3/3] Amending jenkins path for publish job Signed-off-by: Adam Farley --- tools/nightly_build_and_test_stats.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/nightly_build_and_test_stats.groovy b/tools/nightly_build_and_test_stats.groovy index 5f41d78b9..bf70fd780 100644 --- a/tools/nightly_build_and_test_stats.groovy +++ b/tools/nightly_build_and_test_stats.groovy @@ -222,9 +222,9 @@ def getBuildIDsByPlatform(String trssUrl, String jdkVersion, String srcTag, Map // Also, check if the pipeline published any successful builds overall. if (onePipelineBuild.buildName.contains("refactor_openjdk_release_tool") && onePipelineBuild.status.contains("Done")) { - def wgetUrlForReleaseTool = "${onePipelineBuild.buildUrl}/consoleText" + def wgetUrlForReleaseTool = "${onePipelineBuild.url}/job/${onePipelineBuild.buildName}/${onePipelineBuild.buildNum}/consoleText" if (onePipelineBuild.buildOutputId != null) { - wgetUrlForReleaseTool = "${onePipelineBuild.url}/job/${onePipelineBuild.buildName}/${onePipelineBuild.buildNum}/consoleText" + wgetUrlForReleaseTool = "${trssURL}/api/getOutputById?id=${onePipelineBuild.buildOutputId}" } def releaseToolOutput = callWgetSafely(wgetUrlForReleaseTool)