Skip to content

Commit 6dce890

Browse files
pshiptonpshipton
committed
Add build support for jdk25 and 26
Signed-off-by: Peter Shipton <[email protected]>
1 parent 89ce909 commit 6dce890

File tree

5 files changed

+151
-2
lines changed

5 files changed

+151
-2
lines changed

‎buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
* ENABLE_SUMMARY_AUTO_REFRESH: Boolean - flag to enable the downstream summary auto-refresh, default: false
6767
*/
6868

69-
CURRENT_RELEASES = ['8', '11', '17', '21', '23', '24', 'next']
69+
CURRENT_RELEASES = ['8', '11', '17', '21', '23', '24', '25', 'next']
7070

7171
SPECS = ['ppc64_aix' : CURRENT_RELEASES,
7272
'ppc64le_linux' : CURRENT_RELEASES,

‎buildenv/jenkins/variables/defaults.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ openjdk:
4444
default:
4545
repoUrl: 'https://github.com/ibmruntimes/openj9-openjdk-jdk24.git'
4646
branch: 'openj9'
47+
25:
48+
default:
49+
repoUrl: 'https://github.com/ibmruntimes/openj9-openjdk-jdk25.git'
50+
branch: 'openj9'
4751
next:
4852
default:
4953
repoUrl: 'https://github.com/ibmruntimes/openj9-openjdk-jdk.git'
@@ -111,6 +115,7 @@ build_discarder:
111115
OpenJDK17: 3
112116
OpenJDK21: 3
113117
OpenJDK24: 3
118+
OpenJDK25: 3
114119
OpenJDK: 3
115120
Personal: 30
116121
Pipeline: 100
@@ -158,12 +163,14 @@ boot_jdk_default:
158163
17: '17'
159164
21: '21'
160165
24: '24'
166+
25: '24'
161167
next: '24'
162168
dir_strip:
163169
all: '1'
164170
url:
165171
all: 'https://api.adoptopenjdk.net/v3/binary/latest/${bootJDKVersion}/ga/${os}/${arch}/jdk/openj9/normal/adoptopenjdk?project=jdk'
166172
24: 'https://api.adoptium.net/v3/binary/latest/${bootJDKVersion}/ga/${os}/${arch}/jdk/hotspot/normal/eclipse'
173+
25: 'https://api.adoptium.net/v3/binary/latest/${bootJDKVersion}/ga/${os}/${arch}/jdk/hotspot/normal/eclipse'
167174
#========================================#
168175
# CUDA
169176
#========================================#
@@ -184,6 +191,7 @@ disable_javac_server:
184191
17: '--disable-javac-server'
185192
21: '--disable-javac-server'
186193
24: '--disable-javac-server'
194+
25: '--disable-javac-server'
187195
next: '--disable-javac-server'
188196
#========================================#
189197
# Valhalla
@@ -262,7 +270,8 @@ ppc64_aix:
262270
os: 'aix'
263271
url:
264272
all: 'https://api.adoptopenjdk.net/v3/binary/latest/${bootJDKVersion}/ga/${os}/${arch}/jdk/openj9/normal/adoptopenjdk?project=jdk'
265-
24: 'https://openj9-artifactory.osuosl.org/artifactory/ci-openj9/Build_JDK24_ppc64_aix_Nightly/75/OpenJ9-JDK24-ppc64_aix-20250506-234034.tar.gz'
273+
24: 'https://openj9-artifactory.osuosl.org/artifactory/ci-openj9/Build_JDK24_ppc64_aix_Nightly/98/OpenJ9-JDK24-ppc64_aix-20250607-020253.tar.gz'
274+
25: 'https://openj9-artifactory.osuosl.org/artifactory/ci-openj9/Build_JDK24_ppc64_aix_Nightly/98/OpenJ9-JDK24-ppc64_aix-20250607-020253.tar.gz'
266275
release:
267276
all: 'aix-ppc64-server-release'
268277
8: 'aix-ppc64-normal-server-release'
@@ -276,6 +285,7 @@ ppc64_aix:
276285
17: '--disable-warnings-as-errors'
277286
21: '--disable-warnings-as-errors'
278287
24: '--disable-warnings-as-errors'
288+
25: '--disable-warnings-as-errors'
279289
next: '--disable-warnings-as-errors'
280290
build_env:
281291
vars:
@@ -307,6 +317,7 @@ x86-64_linux:
307317
17: '!sw.os.cent.6'
308318
21: '!sw.os.cent.6'
309319
24: '!sw.os.cent.6'
320+
25: '!sw.os.cent.6'
310321
next: '!sw.os.cent.6'
311322
#========================================#
312323
# Linux x86 64bits /w JITSERVER

‎jcl/jpp_configuration.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,34 @@
245245
<parameter name="jxerules:outputdir" value="java/lang"/>
246246
</configuration>
247247

248+
<configuration
249+
label="JAVA26"
250+
outputpath="JAVA26/src"
251+
dependencies="JAVA25"
252+
jdkcompliance="23">
253+
<classpathentry kind="src" path="src/java.base/share/classes"/>
254+
<classpathentry kind="src" path="src/java.management/share/classes"/>
255+
<classpathentry kind="src" path="src/jdk.attach/share/classes"/>
256+
<classpathentry kind="src" path="src/jdk.jcmd/share/classes"/>
257+
<classpathentry kind="src" path="src/jdk.management/share/classes"/>
258+
<classpathentry kind="src" path="src/openj9.criu/share/classes"/>
259+
<classpathentry kind="src" path="src/openj9.cuda/share/classes"/>
260+
<classpathentry kind="src" path="src/openj9.dataaccess/share/classes"/>
261+
<classpathentry kind="src" path="src/openj9.dtfj/share/classes"/>
262+
<classpathentry kind="src" path="src/openj9.dtfjview/share/classes"/>
263+
<classpathentry kind="src" path="src/openj9.gpu/share/classes"/>
264+
<classpathentry kind="src" path="src/openj9.jvm/share/classes"/>
265+
<classpathentry kind="src" path="src/openj9.sharedclasses/share/classes"/>
266+
<classpathentry kind="src" path="src/openj9.traceformat/share/classes"/>
267+
<classpathentry kind="src" path="src/openj9.zosconditionhandling/share/classes"/>
268+
<classpathentry kind="lib" path="/binaries/common/ibm/ibmjzos.jar"/>
269+
<classpathentry kind="lib" path="/binaries/vm/third/rt-compressed.sunJava26.jar"/>
270+
<source path="src"/>
271+
<parameter name="macro:define" value="JAVA_SPEC_VERSION=26"/>
272+
<parameter name="msg:outputdir" value="java.base/share/classes/com/ibm/oti/util"/>
273+
<parameter name="jxerules:outputdir" value="java/lang"/>
274+
</configuration>
275+
248276
<configuration
249277
label="OPENJ9-RAWBUILD"
250278
outputpath="OPENJ9-RAWBUILD/src"

‎test/TestConfig/resources/excludes/latest_exclude_26.txt

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
##############################################################################
2+
# Copyright IBM Corp. and others 2025
3+
#
4+
# This program and the accompanying materials are made available under
5+
# the terms of the Eclipse Public License 2.0 which accompanies this
6+
# distribution and is available at https://www.eclipse.org/legal/epl-2.0/
7+
# or the Apache License, Version 2.0 which accompanies this distribution and
8+
# is available at https://www.apache.org/licenses/LICENSE-2.0.
9+
#
10+
# This Source Code may also be made available under the following
11+
# Secondary Licenses when the conditions for such availability set
12+
# forth in the Eclipse Public License, v. 2.0 are satisfied: GNU
13+
# General Public License, version 2 with the GNU Classpath
14+
# Exception [1] and GNU General Public License, version 2 with the
15+
# OpenJDK Assembly Exception [2].
16+
#
17+
# [1] https://www.gnu.org/software/classpath/license.html
18+
# [2] https://openjdk.org/legal/assembly-exception.html
19+
#
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
21+
##############################################################################
22+
23+
# Exclude tests temporarily
24+
25+
org.openj9.test.vm.Test_MsgHelp:test_loadMessages_EN AN-https://github.ibm.com/runtimes/test/issues/46 generic-all
26+
org.openj9.test.vmArguments.VmArgumentTests:testCrNocr 244 generic-all
27+
org.openj9.test.nestmates.NestAttributeTest:testGetNestMembersAPIInValidMembers NA generic-all
28+
org.openj9.test.nestmates.NestAttributeTest:testGetNestMembersAPIInValidHost NA generic-all
29+
org.openj9.test.nestmates.NestAttributeTest:testGetNestMembersAPIInValidHostWrongPackage NA generic-all
30+
org.openj9.test.nestmates.NestAttributeTest:testGetNestMembersAPINestMemberWrongPackage NA generic-all
31+
org.openj9.test.nestmates.NestAttributeTest:testGetNestMembersAPINestMemberWrongNestHost NA generic-all
32+
org.openj9.test.nestmates.NestAttributeTest:testGetNestMembersAPINestMemberWrongNestHost2 NA generic-all
33+
34+
# Exclude Java 19 Thread related failures
35+
36+
org.openj9.test.java.lang.Test_ThreadGroup:test_activeCount NA generic-all
37+
org.openj9.test.java.lang.Test_ThreadGroup:test_Constructor2 NA generic-all
38+
org.openj9.test.java.lang.Test_ThreadGroup:test_destroy NA generic-all
39+
org.openj9.test.java.lang.Test_ThreadGroup:test_destroy2 NA generic-all
40+
org.openj9.test.java.lang.Test_ThreadGroup:test_destroy3 NA generic-all
41+
org.openj9.test.java.lang.Test_ThreadGroup:test_list NA generic-all
42+
org.openj9.test.java.lang.Test_ThreadGroup:test_remove NA generic-all
43+
org.openj9.test.java.lang.Test_ThreadGroup:test_resume NA generic-all
44+
org.openj9.test.java.lang.Test_ThreadGroup:test_setDaemon2 NA generic-all
45+
org.openj9.test.java.lang.Test_ThreadGroup:test_stop NA generic-all
46+
org.openj9.test.java.lang.Test_ThreadGroup:test_suspend NA generic-all
47+
org.openj9.test.java.lang.Test_ThreadGroup:test_uncaughtException NA generic-all
48+
org.openj9.test.java.lang.Test_Thread:test_start_WeakReference NA generic-all
49+
org.openj9.test.java.lang.Test_Thread:test_currentThread NA generic-all
50+
org.openj9.test.java.lang.Test_Thread:test_toString NA generic-all
51+
org.openj9.test.java.lang.management.TestManagementFactory:testGetPlatformMXBeans NA generic-all

‎test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_26.xml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
2+
<!--
3+
Copyright IBM Corp. and others 2025
4+
5+
This program and the accompanying materials are made available under
6+
the terms of the Eclipse Public License 2.0 which accompanies this
7+
distribution and is available at https://www.eclipse.org/legal/epl-2.0/
8+
or the Apache License, Version 2.0 which accompanies this distribution and
9+
is available at https://www.apache.org/licenses/LICENSE-2.0.
10+
11+
This Source Code may also be made available under the following
12+
Secondary Licenses when the conditions for such availability set
13+
forth in the Eclipse Public License, v. 2.0 are satisfied: GNU
14+
General Public License, version 2 with the GNU Classpath
15+
Exception [1] and GNU General Public License, version 2 with the
16+
OpenJDK Assembly Exception [2].
17+
18+
[1] https://www.gnu.org/software/classpath/license.html
19+
[2] https://openjdk.org/legal/assembly-exception.html
20+
21+
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
22+
-->
23+
<!DOCTYPE suite SYSTEM "excludes.dtd">
24+
<?xml:stylesheet type="text/xsl" href="excludes.xsl"?>
25+
26+
<suite id="jvmtitest">
27+
28+
<!-- Define exclude configs here (all & platform names are parsed for free by harness) -->
29+
<platform id="all"/>
30+
<platform id="aix_ppc-64"/>
31+
<platform id="win_x86_newrom"/>
32+
33+
<!-- AIX64 - The test creates thousands of threads without exhausting its available heap. Probably due to some sort of lazy stack mapping on the OS side -->
34+
<exclude id="re002" platform="all" shouldFix="true">
35+
<reason>No reliable cross-platform way of simulating this condition</reason>
36+
</exclude>
37+
38+
<exclude id="gts001" platform="all" shouldFix="true">
39+
<reason>Test is not very robust at the moment. Time dependency might cause it to fail</reason>
40+
</exclude>
41+
42+
<exclude id="mt001" platform="latest" shouldFix="true">
43+
<reason>Test doesn't work for b149 and later. Issue: </reason>
44+
</exclude>
45+
46+
<exclude id="fer001" platform="all" shouldFix="true">
47+
<reason>Testcase deadlocks due to bogus locking, replaced by fer003. keep fer001 for component debugging</reason>
48+
</exclude>
49+
50+
<!-- Windows IA32 New ROMClass Builder - the test requires retransform support, which will be implemented under JAZZ 19331 -->
51+
<exclude id="gpc002" platform="win_x86_newrom" shouldFix="true" expiry="Oct 8 2009">
52+
<reason>Testcase requires retransform support, which will be implemented under JAZZ 19331</reason>
53+
</exclude>
54+
55+
<exclude id="nmr001" platform="all">
56+
<reason>Nestmates are not enabled on java10</reason>
57+
</exclude>
58+
59+
</suite>

0 commit comments

Comments
 (0)