Skip to content

Commit b6c0e7c

Browse files
committed
[Y-build] Prepare builds for Java-26 BETA
Move tests to targeted Java version Java-26. Also drop the second MacOS test configuration and add Y-build tests for Windows instead. Additionally fix the computation of the temurin download URL and fix installing tools on Windows.
1 parent 53690b4 commit b6c0e7c

File tree

2 files changed

+23
-22
lines changed

2 files changed

+23
-22
lines changed

JenkinsJobs/YBuilds/Y_unit_tests.groovy

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,24 @@ def pathOf(String path){
122122
def installTemurinJDK(String version, String os, String arch, String releaseType='ga') {
123123
// Translate os/arch names that are different in the Adoptium API
124124
if (arch == 'x86_64') {
125-
arch == 'x64'
125+
arch = 'x64'
126126
}
127-
return install('jdk', "https://api.adoptium.net/v3/binary/latest/${version}/${releaseType}/${os}/${arch}/jdk/hotspot/normal/eclipse")
127+
if (os == 'macosx') {
128+
os = 'mac'
129+
} else if (os == 'win32') {
130+
os = 'windows'
131+
}
132+
return install('jdk', "https://api.adoptium.net/v3/binary/latest/${version}/${releaseType}/${os}/${arch}/jdk/hotspot/normal/eclipse") + (os == 'mac' ? '/Contents/Home' : '')
128133
}
129134
130135
def install(String toolType, String url) {
131136
dir("${WORKSPACE}/tools/${toolType}") {
132-
sh "curl -L ${url} | tar -xzf -"
137+
def script = "curl -L ${url} | tar -xzf -"
138+
if (isUnix()) {
139+
sh script
140+
} else { // Windows 10 and later has a tar.exe that can handle zip files (even read from std-in)
141+
bat script
142+
}
133143
return "${pwd()}/" + sh(script: 'ls', returnStdout: true).strip()
134144
}
135145
}

JenkinsJobs/buildConfigurations.json

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,17 @@
5353
]
5454
},
5555
"Y": {
56-
"typeName": "Beta Java 25",
56+
"typeName": "Beta Java 26",
5757
"streams": {
5858
"4.38": {
5959
"branch": "master",
60-
"disabled": "true",
6160
"schedule": "0 10 * 8-10 2,4,6\n0 10 1-26 11 2,4,6"
6261
}
6362
},
6463
"branches": {
65-
"eclipse.jdt.core": "BETA_JAVA25",
66-
"eclipse.jdt.debug": "BETA_JAVA25",
67-
"eclipse.jdt.ui": "BETA_JAVA25"
64+
"eclipse.jdt.core": "BETA_JAVA26",
65+
"eclipse.jdt.debug": "BETA_JAVA26",
66+
"eclipse.jdt.ui": "BETA_JAVA26"
6867
},
6968
"mailingList": "[email protected]",
7069
"testJobFolder": "YBuilds",
@@ -81,33 +80,25 @@
8180
"os": "linux",
8281
"ws": "gtk",
8382
"arch": "x86_64",
84-
"javaVersion": 25,
83+
"javaVersion": 26,
8584
"agentLabel": "ubuntu-2404",
86-
"javaHome": "install('jdk', 'https://download.java.net/java/GA/jdk25/bd75d5f9689641da8e1daabeccb5528b/36/GPL/openjdk-25_linux-x64_bin.tar.gz')"
85+
"javaHome": "tool(type:'jdk', name:'openjdk-jdk26-latest')"
8786
},
8887
{
8988
"os": "macosx",
9089
"ws": "cocoa",
9190
"arch": "aarch64",
92-
"javaVersion": 21,
91+
"javaVersion": 26,
9392
"agentLabel": "nc1ht-macos11-arm64",
94-
"javaHome": "'/Library/Java/JavaVirtualMachines/jdk-21.0.5+11-arm64/Contents/Home'"
95-
},
96-
{
97-
"os": "macosx",
98-
"ws": "cocoa",
99-
"arch": "x86_64",
100-
"javaVersion": 21,
101-
"agentLabel": "nc1ht-macos11-arm64",
102-
"javaHome": "'/Library/Java/JavaVirtualMachines/jdk-21.0.5+11/Contents/Home'"
93+
"javaHome": "install('jdk', 'https://download.java.net/java/early_access/jdk26/18/GPL/openjdk-26-ea+18_macos-aarch64_bin.tar.gz')"
10394
},
10495
{
10596
"os": "win32",
10697
"ws": "win32",
10798
"arch": "x86_64",
108-
"javaVersion": 21,
99+
"javaVersion": 26,
109100
"agentLabel": "qa6xd-win11",
110-
"javaHome": "'C:\\\\Program Files\\\\Eclipse Adoptium\\\\jdk-21.0.5.11-hotspot'"
101+
"javaHome": "install('jdk', 'https://download.java.net/java/early_access/jdk26/18/GPL/openjdk-26-ea+18_windows-x64_bin.zip')"
111102
}
112103
]
113104
}

0 commit comments

Comments
 (0)