From 6f88405fa814c379d0580b9185f03f739959ef64 Mon Sep 17 00:00:00 2001 From: Lan Xia Date: Tue, 15 Oct 2024 15:20:11 -0400 Subject: [PATCH] exclude JDK23+ and jdknext openj9 xmac testing on mac10 Signed-off-by: Lan Xia --- buildenv/jenkins/openjdk_tests | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/buildenv/jenkins/openjdk_tests b/buildenv/jenkins/openjdk_tests index 096b641191..1efc94a0a0 100644 --- 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.isInteger() || params.JDK_VERSION.toInteger() >= 23) { + LABEL += "&&!sw.os.mac.10" + } } if (params.DOCKER_REQUIRED) {