exclude JDK23+ and jdknext openj9 xmac testing on mac10

Signed-off-by: Lan Xia <Lan_Xia@ca.ibm.com>
adoptium · Oct 15, 2024 · 579188d · 579188d
1 parent b8c40b4
commit 579188d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/buildenv/jenkins/openjdk_tests b/buildenv/jenkins/openjdk_tests
@@ -303,8 +303,11 @@ timestamps{
             }
 
             // JDK23+ isn't supported on machines prior to Mac 11 https://github.com/eclipse-openj9/openj9/issues/19694
-            if (params.JDK_IMPL == "openj9" && PLATFORM == "x86-64_mac" && params.JDK_VERSION && params.JDK_VERSION.toInteger() >= 23) {
-                LABEL += "&&!sw.os.mac.10"
+            // assume if JDK_VERSION is set to next, JDK_VERSION is 23+
+            if (params.JDK_IMPL == "openj9" && PLATFORM == "x86-64_mac" && params.JDK_VERSION){
+                if (params.JDK_VERSION.equalsIgnoreCase("next") || params.JDK_VERSION.toInteger() >= 23) {
+                    LABEL += "&&!sw.os.mac.10"
+                }
             }
 
             if (params.DOCKER_REQUIRED) {