Skip to content

Allow ATH usage on Java 25 #2245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timja merged 2 commits into from
Jan 1, 2026
Merged

Allow ATH usage on Java 25 #2245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
917c232
Test on Java 25
NotMyFault Nov 10, 2025
5b8f142
Exclude LTS from 25
NotMyFault Dec 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ if (needSplittingFromWorkspace) {
def axes = [
jenkinsVersions: ['lts', 'latest'],
platforms: ['linux'],
jdks: [17, 21],
jdks: [17, 21, 25],
browsers: ['firefox'],
]

stage('Record builds and sessions') {
retry(conditions: [kubernetesAgent(handleNonKubernetes: true), nonresumable()], count: 2) {
node('maven-21') {
node('maven-25') {
infra.checkoutSCM()
def athCommit = sh(script: 'git rev-parse HEAD', returnStdout: true).trim()
withCredentials([string(credentialsId: 'launchable-jenkins-acceptance-test-harness', variable: 'LAUNCHABLE_TOKEN')]) {
Expand Down Expand Up @@ -81,7 +81,7 @@ stage('Record builds and sessions') {
branches['CI'] = {
stage('CI') {
retry(count: 2, conditions: [kubernetesAgent(handleNonKubernetes: true), nonresumable()]) {
node('maven-21') {
node('maven-25') {
checkout scm
def mavenOptions = [
'-Dset.changelist',
Expand All @@ -90,7 +90,7 @@ branches['CI'] = {
'clean',
'install',
]
infra.runMaven(mavenOptions, 21)
infra.runMaven(mavenOptions, 25)
infra.prepareToPublishIncrementals()
}
}
Expand All @@ -101,10 +101,10 @@ for (int i = 0; i < splits.size(); i++) {
int index = i
axes.values().combinations {
def (jenkinsVersion, platform, jdk, browser) = it
if (jdk == 21 && jenkinsVersion != 'latest') {
if (jenkinsVersion == 'latest' && !(jdk in [21, 25])) {
return
}
if (jdk != 21 && jenkinsVersion == 'latest') {
if (jenkinsVersion == 'lts' && jdk != 21) {
return
}
def name = "${jenkinsVersion}-${platform}-jdk${jdk}-${browser}-split${index}"
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/ath-container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ RUN apt-get update \
lsb-release \
openjdk-17-jdk \
openjdk-21-jdk \
openjdk-25-jdk \
openssh-client \
unzip \
xfonts-base \
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/ath-container/set-java.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ if [[ $1 == '17' ]]; then
selection='17-openjdk'
elif [[ $1 == '21' ]]; then
selection='21-openjdk'
elif [[ $1 == '25' ]]; then
selection='25-openjdk'
else
echo >&2 "Unsupported java version '${1}'"
exit 1
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
zip \
openjdk-17-jdk \
openjdk-21-jdk \
openjdk-25-jdk \
&& rm -rf /var/lib/apt/lists/*

# create a git user and create .ssh dir
Expand Down