Skip to content

Commit c22139f

Browse files
authored
Run AIX tests for jdk25+ with the 17.1 C++ Runtime (#6568)
Signed-off-by: Peter Shipton <[email protected]>
1 parent cf6b979 commit c22139f

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

buildenv/jenkins/openjdk_tests

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -334,13 +334,18 @@ timestamps{
334334
LABEL = params.LABEL
335335
} else {
336336
LABEL = PLATFORM_MAP[params.PLATFORM]["LABEL"]
337-
if (params.BUILD_LIST.contains("perf")) {
338-
def perfLabel = LABEL.minus("ci.role.test&&").concat("&&ci.role.perf")
339-
if (areNodesWithLabelOnline(perfLabel)) {
337+
if (params.BUILD_LIST.contains("perf")) {
338+
def perfLabel = LABEL.minus("ci.role.test&&").concat("&&ci.role.perf")
339+
if (areNodesWithLabelOnline(perfLabel)) {
340340
LABEL = perfLabel
341-
}
342341
}
343342
}
343+
if (PLATFORM == "ppc64_aix" && params.JDK_IMPL == "openj9" && env.JENKINS_URL.contains("hyc-runtimes")) {
344+
if (!params.JDK_VERSION.isInteger() || params.JDK_VERSION.toInteger() >= 25) {
345+
LABEL += "&&sw.tool.c++runtime.17_1"
346+
}
347+
}
348+
}
344349

345350
// Temporarily support both FIPS and FIPS140_2, remove FIPS in the next step
346351
if (params.TEST_FLAG) {

0 commit comments

Comments
 (0)