Update daily Slack status to handle multiple head repo versions jdk24…

… and jdk25 (#1163) * Prevent build_job_generator regeneration from blowing up if no targetConfigurations Signed-off-by: Andrew Leonard <[email protected]> * Allow for multiple tip/head repo release versions Signed-off-by: Andrew Leonard <[email protected]> * Allow for multiple tip/head repo release versions Signed-off-by: Andrew Leonard <[email protected]> --------- Signed-off-by: Andrew Leonard <[email protected]>
adoptium · Dec 11, 2024 · 0f1a7a9 · 0f1a7a9
1 parent f5db088
commit 0f1a7a9
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/tools/nightly_build_and_test_stats.groovy b/tools/nightly_build_and_test_stats.groovy
@@ -57,7 +57,7 @@ def getPlatformReproTestMap() {
 
 // Check if the given tag is a -ga tag ?
 def isGaTag(String version, String tag) {
-    if (version == "${params.TIP_RELEASE}".trim()) {
+    if ("${params.TIP_RELEASES}".contains(version)) {
         // Tip release has no GA tags
         return false
     }
@@ -595,7 +595,7 @@ node('worker') {
     def apiUrl    = "${params.API_URL}"
     def slackChannel = "${params.SLACK_CHANNEL}"
     def featureReleases = "${params.FEATURE_RELEASES}".split("[, ]+") // feature versions 
-    def tipRelease      = "${params.TIP_RELEASE}".trim() // Current jdk(head) version
+    def tipReleases     = "${params.TIP_RELEASES}".split("[, ]+") // Current jdk(head) versions
     def nightlyStaleDays = "${params.MAX_NIGHTLY_STALE_DAYS}"
     def amberBuildAlertLevel = params.AMBER_BUILD_ALERT_LEVEL ? params.AMBER_BUILD_ALERT_LEVEL as Integer : -99
     def amberTestAlertLevel  = params.AMBER_TEST_ALERT_LEVEL  ? params.AMBER_TEST_ALERT_LEVEL as Integer : -99
@@ -668,15 +668,17 @@ node('worker') {
               }
             }
 
-            // Check tip_release status, by querying binaries repo as API does not server the "tip" dev release
-            if (tipRelease != "") {
+            // Check tip_releases status, by querying binaries repo as API does not server the "tip" dev releases
+            if (tipReleases.size() > 0) {
+             tipReleases.each { tipRelease ->
               def latestOpenjdkBuild = getLatestOpenjdkBuildTag(tipRelease)
               def tipVersion = tipRelease.replaceAll("[a-z]","").toInteger()
               def releaseName = getLatestBinariesTag("${tipVersion}")
               status = [releaseName: releaseName, expectedReleaseName: "${latestOpenjdkBuild}-ea-beta", upstreamTag: latestOpenjdkBuild]
               verifyReleaseContent(tipRelease, releaseName, variant, status)
               echo "  ${tipRelease} release binaries verification: "+status['assets']
               healthStatus[tipRelease] = status
+             }
             }
         }
     }
@@ -698,8 +700,8 @@ node('worker') {
         def pipelinesOfInterest = ""
         def allReleases = []
         allReleases.addAll(featureReleases)
-        if (tipRelease != "") {
-            allReleases.add(tipRelease)
+        if (tipReleases.size() > 0) {
+            allReleases.addAll(tipReleases)
         }
         if ("${params.NON_TAG_BUILD_RELEASES}".trim() != "") {
            allReleases.addAll(nonTagBuildReleases)
@@ -901,8 +903,8 @@ node('worker') {
             echo '-------------- Latest pipeline health report ------------------'
             def allReleases = []
             allReleases.addAll(featureReleases)
-            if (tipRelease != "") {
-                allReleases.add(tipRelease)
+            if (tipReleases.size() > 0) {
+                allReleases.addAll(tipReleases)
             }
             if (("${params.NON_TAG_BUILD_RELEASES}".trim() != "")) {
                allReleases.addAll(nonTagBuildReleases)