Skip to content

Commit 9b51e58

Browse files
mernstsmillst
andauthored
Test under Java 25 (#7113)
Co-authored-by: Suzanne Millstein <[email protected]>
1 parent 2403df2 commit 9b51e58

32 files changed

+366
-69
lines changed

.azure/azure-pipelines-daily.yml

Lines changed: 122 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
# The dependsOn clauses are:
2222
# * Everything depends on the canary jobs (the main jdk24 jobs), except those jobs themselves.
23-
# * Anything *_jdk11 or *_jdk17 or *_jdk21 depends on *_jdk24.
23+
# * Anything *_jdk11 or *_jdk17 or *_jdk21 or *_jdk25 depends on *_jdk24.
2424

2525
- job: canary_jobs
2626
dependsOn:
@@ -47,7 +47,7 @@ jobs:
4747
steps:
4848
- checkout: self
4949
fetchDepth: 25
50-
- bash: ./checker/bin-devel/test-cftests-junit.sh
50+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=11 && ./checker/bin-devel/test-cftests-junit.sh
5151
displayName: test-cftests-junit.sh
5252
- job: junit_jdk17
5353
dependsOn:
@@ -60,7 +60,7 @@ jobs:
6060
steps:
6161
- checkout: self
6262
fetchDepth: 25
63-
- bash: ./checker/bin-devel/test-cftests-junit.sh
63+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=17 && ./checker/bin-devel/test-cftests-junit.sh
6464
displayName: test-cftests-junit.sh
6565
- job: junit_jdk21
6666
dependsOn:
@@ -73,7 +73,7 @@ jobs:
7373
steps:
7474
- checkout: self
7575
fetchDepth: 25
76-
- bash: ./checker/bin-devel/test-cftests-junit.sh
76+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=21 && ./checker/bin-devel/test-cftests-junit.sh
7777
displayName: test-cftests-junit.sh
7878
- job: junit_jdk24
7979
pool:
@@ -83,7 +83,20 @@ jobs:
8383
steps:
8484
- checkout: self
8585
fetchDepth: 25
86-
- bash: ./checker/bin-devel/test-cftests-junit.sh
86+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=24 && ./checker/bin-devel/test-cftests-junit.sh
87+
displayName: test-cftests-junit.sh
88+
- job: junit_jdk25
89+
dependsOn:
90+
- canary_jobs
91+
- junit_jdk24
92+
pool:
93+
vmImage: 'ubuntu-latest'
94+
container: mdernst/cf-ubuntu-jdk25:latest
95+
timeoutInMinutes: 70
96+
steps:
97+
- checkout: self
98+
fetchDepth: 25
99+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=25 && ./checker/bin-devel/test-cftests-junit.sh
87100
displayName: test-cftests-junit.sh
88101

89102
- job: nonjunit_jdk11
@@ -96,7 +109,7 @@ jobs:
96109
steps:
97110
- checkout: self
98111
fetchDepth: 25
99-
- bash: ./checker/bin-devel/test-cftests-nonjunit.sh
112+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=11 && ./checker/bin-devel/test-cftests-nonjunit.sh
100113
displayName: test-cftests-nonjunit.sh
101114
- job: nonjunit_jdk17
102115
dependsOn:
@@ -108,7 +121,7 @@ jobs:
108121
steps:
109122
- checkout: self
110123
fetchDepth: 25
111-
- bash: ./checker/bin-devel/test-cftests-nonjunit.sh
124+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=17 && ./checker/bin-devel/test-cftests-nonjunit.sh
112125
displayName: test-cftests-nonjunit.sh
113126
- job: nonjunit_jdk21
114127
dependsOn:
@@ -120,7 +133,7 @@ jobs:
120133
steps:
121134
- checkout: self
122135
fetchDepth: 25
123-
- bash: ./checker/bin-devel/test-cftests-nonjunit.sh
136+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=21 && ./checker/bin-devel/test-cftests-nonjunit.sh
124137
displayName: test-cftests-nonjunit.sh
125138
- job: nonjunit_jdk24
126139
pool:
@@ -129,7 +142,19 @@ jobs:
129142
steps:
130143
- checkout: self
131144
fetchDepth: 25
132-
- bash: ./checker/bin-devel/test-cftests-nonjunit.sh
145+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=24 && ./checker/bin-devel/test-cftests-nonjunit.sh
146+
displayName: test-cftests-nonjunit.sh
147+
- job: nonjunit_jdk25
148+
dependsOn:
149+
- canary_jobs
150+
- nonjunit_jdk24
151+
pool:
152+
vmImage: 'ubuntu-latest'
153+
container: mdernst/cf-ubuntu-jdk25:latest
154+
steps:
155+
- checkout: self
156+
fetchDepth: 25
157+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=25 && ./checker/bin-devel/test-cftests-nonjunit.sh
133158
displayName: test-cftests-nonjunit.sh
134159

135160
# Sometimes one of the invocations of wpi-many in `./gradlew wpiManyTest`
@@ -148,7 +173,7 @@ jobs:
148173
steps:
149174
- checkout: self
150175
fetchDepth: 25
151-
- bash: ./checker/bin-devel/test-cftests-inference.sh
176+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=11 && ./checker/bin-devel/test-cftests-inference.sh
152177
displayName: test-cftests-inference.sh
153178

154179
- job: inference_jdk17
@@ -163,7 +188,7 @@ jobs:
163188
steps:
164189
- checkout: self
165190
fetchDepth: 25
166-
- bash: ./checker/bin-devel/test-cftests-inference.sh
191+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=17 && ./checker/bin-devel/test-cftests-inference.sh
167192
displayName: test-cftests-inference.sh
168193

169194
- job: inference_jdk21
@@ -178,7 +203,7 @@ jobs:
178203
steps:
179204
- checkout: self
180205
fetchDepth: 25
181-
- bash: ./checker/bin-devel/test-cftests-inference.sh
206+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=21 && ./checker/bin-devel/test-cftests-inference.sh
182207
displayName: test-cftests-inference.sh
183208

184209
# Split into part1 and part2 only for the inference job that "canary_jobs" depends on.
@@ -190,7 +215,7 @@ jobs:
190215
steps:
191216
- checkout: self
192217
fetchDepth: 25
193-
- bash: ./checker/bin-devel/test-cftests-inference-part1.sh
218+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=24 && ./checker/bin-devel/test-cftests-inference-part1.sh
194219
displayName: test-cftests-inference-part1.sh
195220
- job: inference_part2_jdk24
196221
pool:
@@ -200,9 +225,24 @@ jobs:
200225
steps:
201226
- checkout: self
202227
fetchDepth: 25
203-
- bash: ./checker/bin-devel/test-cftests-inference-part2.sh
228+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=24 && ./checker/bin-devel/test-cftests-inference-part2.sh
204229
displayName: test-cftests-inference-part2.sh
205230

231+
- job: inference_jdk25
232+
dependsOn:
233+
- canary_jobs
234+
- inference_part1_jdk24
235+
- inference_part2_jdk24
236+
pool:
237+
vmImage: 'ubuntu-latest'
238+
container: mdernst/cf-ubuntu-jdk25:latest
239+
timeoutInMinutes: 90
240+
steps:
241+
- checkout: self
242+
fetchDepth: 25
243+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=25 && ./checker/bin-devel/test-cftests-inference.sh
244+
displayName: test-cftests-inference.sh
245+
206246

207247
# Do not run misc_job daily, because it does diffs that assume it is running in
208248
# a pull request.
@@ -218,7 +258,7 @@ jobs:
218258
steps:
219259
- checkout: self
220260
fetchDepth: 1000
221-
- bash: ./checker/bin-devel/test-typecheck.sh
261+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=11 && ./checker/bin-devel/test-typecheck.sh
222262
displayName: test-typecheck.sh
223263
- job: typecheck_jdk17
224264
dependsOn:
@@ -231,7 +271,7 @@ jobs:
231271
steps:
232272
- checkout: self
233273
fetchDepth: 1000
234-
- bash: ./checker/bin-devel/test-typecheck.sh
274+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=17 && ./checker/bin-devel/test-typecheck.sh
235275
displayName: test-typecheck.sh
236276
- job: typecheck_jdk21
237277
dependsOn:
@@ -244,7 +284,7 @@ jobs:
244284
steps:
245285
- checkout: self
246286
fetchDepth: 1000
247-
- bash: ./checker/bin-devel/test-typecheck.sh
287+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=21 && ./checker/bin-devel/test-typecheck.sh
248288
displayName: test-typecheck.sh
249289
- job: typecheck_part1_jdk24
250290
pool:
@@ -253,7 +293,7 @@ jobs:
253293
steps:
254294
- checkout: self
255295
fetchDepth: 1000
256-
- bash: ./checker/bin-devel/test-typecheck-part1.sh
296+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=24 && ./checker/bin-devel/test-typecheck-part1.sh
257297
displayName: test-typecheck-part1.sh
258298
- job: typecheck_part2_jdk24
259299
pool:
@@ -264,6 +304,19 @@ jobs:
264304
fetchDepth: 1000
265305
- bash: ./checker/bin-devel/test-typecheck-part2.sh
266306
displayName: test-typecheck-part2.sh
307+
- job: typecheck_jdk25
308+
dependsOn:
309+
- canary_jobs
310+
- typecheck_part1_jdk24
311+
- typecheck_part2_jdk24
312+
pool:
313+
vmImage: 'ubuntu-latest'
314+
container: mdernst/cf-ubuntu-jdk25-plus:latest
315+
steps:
316+
- checkout: self
317+
fetchDepth: 1000
318+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=25 && ./checker/bin-devel/test-typecheck.sh
319+
displayName: test-typecheck.sh
267320

268321
- job: daikon_jdk11
269322
dependsOn:
@@ -277,7 +330,7 @@ jobs:
277330
steps:
278331
- checkout: self
279332
fetchDepth: 25
280-
- bash: ./checker/bin-devel/test-daikon.sh
333+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=11 && ./checker/bin-devel/test-daikon.sh
281334
displayName: test-daikon.sh
282335
- job: daikon_jdk17
283336
dependsOn:
@@ -291,7 +344,7 @@ jobs:
291344
steps:
292345
- checkout: self
293346
fetchDepth: 25
294-
- bash: ./checker/bin-devel/test-daikon.sh
347+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=17 && ./checker/bin-devel/test-daikon.sh
295348
displayName: test-daikon.sh
296349
- job: daikon_jdk21
297350
dependsOn:
@@ -305,7 +358,7 @@ jobs:
305358
steps:
306359
- checkout: self
307360
fetchDepth: 25
308-
- bash: ./checker/bin-devel/test-daikon.sh
361+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=21 && ./checker/bin-devel/test-daikon.sh
309362
displayName: test-daikon.sh
310363
- job: daikon_part1_jdk24
311364
dependsOn:
@@ -317,7 +370,7 @@ jobs:
317370
steps:
318371
- checkout: self
319372
fetchDepth: 25
320-
- bash: ./checker/bin-devel/test-daikon-part1.sh
373+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=24 && ./checker/bin-devel/test-daikon-part1.sh
321374
displayName: test-daikon.sh
322375
- job: daikon_part2_jdk24
323376
dependsOn:
@@ -329,8 +382,22 @@ jobs:
329382
steps:
330383
- checkout: self
331384
fetchDepth: 25
332-
- bash: ./checker/bin-devel/test-daikon.sh
385+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=24 && ./checker/bin-devel/test-daikon.sh
333386
displayName: test-daikon-part2.sh
387+
- job: daikon_jdk25
388+
dependsOn:
389+
- canary_jobs
390+
- daikon_part1_jdk24
391+
- daikon_part2_jdk24
392+
pool:
393+
vmImage: 'ubuntu-latest'
394+
container: mdernst/cf-ubuntu-jdk25:latest
395+
timeoutInMinutes: 80
396+
steps:
397+
- checkout: self
398+
fetchDepth: 25
399+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=25 && ./checker/bin-devel/test-daikon.sh
400+
displayName: test-daikon.sh
334401

335402
## I think the guava_jdk11 job is failing due to Error Prone not supporting JDK 11.
336403
- job: guava_jdk17
@@ -344,7 +411,7 @@ jobs:
344411
steps:
345412
- checkout: self
346413
fetchDepth: 25
347-
- bash: ./checker/bin-devel/test-guava.sh
414+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=17 && ./checker/bin-devel/test-guava.sh
348415
displayName: test-guava.sh
349416
- job: guava_jdk21
350417
dependsOn:
@@ -357,7 +424,7 @@ jobs:
357424
steps:
358425
- checkout: self
359426
fetchDepth: 25
360-
- bash: ./checker/bin-devel/test-guava.sh
427+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=21 && ./checker/bin-devel/test-guava.sh
361428
displayName: test-guava.sh
362429
- job: guava_jdk24
363430
dependsOn:
@@ -369,7 +436,20 @@ jobs:
369436
steps:
370437
- checkout: self
371438
fetchDepth: 25
372-
- bash: ./checker/bin-devel/test-guava.sh
439+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=24 && ./checker/bin-devel/test-guava.sh
440+
displayName: test-guava.sh
441+
- job: guava_jdk25
442+
dependsOn:
443+
- canary_jobs
444+
- guava_jdk24
445+
pool:
446+
vmImage: 'ubuntu-latest'
447+
container: mdernst/cf-ubuntu-jdk25:latest
448+
timeoutInMinutes: 70
449+
steps:
450+
- checkout: self
451+
fetchDepth: 25
452+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=25 && ./checker/bin-devel/test-guava.sh
373453
displayName: test-guava.sh
374454

375455
- job: plume_lib_jdk11
@@ -382,7 +462,7 @@ jobs:
382462
steps:
383463
- checkout: self
384464
fetchDepth: 25
385-
- bash: ./checker/bin-devel/test-plume-lib.sh
465+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=11 && ./checker/bin-devel/test-plume-lib.sh
386466
displayName: test-plume-lib.sh
387467
- job: plume_lib_jdk17
388468
dependsOn:
@@ -394,7 +474,7 @@ jobs:
394474
steps:
395475
- checkout: self
396476
fetchDepth: 25
397-
- bash: ./checker/bin-devel/test-plume-lib.sh
477+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=17 && ./checker/bin-devel/test-plume-lib.sh
398478
displayName: test-plume-lib.sh
399479
- job: plume_lib_jdk21
400480
dependsOn:
@@ -406,7 +486,7 @@ jobs:
406486
steps:
407487
- checkout: self
408488
fetchDepth: 25
409-
- bash: ./checker/bin-devel/test-plume-lib.sh
489+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=21 && ./checker/bin-devel/test-plume-lib.sh
410490
displayName: test-plume-lib.sh
411491
- job: plume_lib_jdk24
412492
dependsOn:
@@ -417,7 +497,19 @@ jobs:
417497
steps:
418498
- checkout: self
419499
fetchDepth: 25
420-
- bash: ./checker/bin-devel/test-plume-lib.sh
500+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=24 && ./checker/bin-devel/test-plume-lib.sh
501+
displayName: test-plume-lib.sh
502+
- job: plume_lib_jdk25
503+
dependsOn:
504+
- canary_jobs
505+
- plume_lib_jdk24
506+
pool:
507+
vmImage: 'ubuntu-latest'
508+
container: mdernst/cf-ubuntu-jdk25:latest
509+
steps:
510+
- checkout: self
511+
fetchDepth: 25
512+
- bash: export ORG_GRADLE_PROJECT_jdkTestVersion=25 && ./checker/bin-devel/test-plume-lib.sh
421513
displayName: test-plume-lib.sh
422514

423515
## The downstream jobs are not currently needed because test-downstream.sh is empty.

0 commit comments

Comments
 (0)