Skip to content

Remove Java 17 from images #2570

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
NotMyFault merged 1 commit into from
Jan 3, 2026
Merged

Remove Java 17 from images #2570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if (needSplittingFromWorkspace) {
def axes = [
jenkinsVersions: ['lts', 'latest'],
platforms: ['linux'],
jdks: [17, 21, 25],
jdks: [21, 25],
browsers: ['firefox'],
]

Expand Down
2 changes: 1 addition & 1 deletion ath-container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fi

trap 'docker-compose kill && docker-compose down' EXIT

docker-compose run --name mvn --rm -P -v "${HOME}/.m2/repository:/home/ath-user/.m2/repository:Z" mvn bash -c 'set-java.sh 17; bash'
docker-compose run --name mvn --rm -P -v "${HOME}/.m2/repository:/home/ath-user/.m2/repository:Z" mvn bash -c 'set-java.sh 25; bash'
status=$?

exit $status
1 change: 0 additions & 1 deletion src/main/resources/ath-container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ RUN apt-get update \
imagemagick \
jq \
lsb-release \
openjdk-17-jdk \
openjdk-21-jdk \
openjdk-25-jdk \
openssh-client \
Expand Down
4 changes: 1 addition & 3 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 @@ -4,9 +4,7 @@ set -uo pipefail
trap 's=$?; echo >&2 "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR

# The selection used by update-alternatives for each java version
if [[ $1 == '17' ]]; then
selection='17-openjdk'
elif [[ $1 == '21' ]]; then
if [[ $1 == '21' ]]; then
selection='21-openjdk'
elif [[ $1 == '25' ]]; then
selection='25-openjdk'
Expand Down
1 change: 0 additions & 1 deletion 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 @@ -12,7 +12,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
openssh-server \
git \
zip \
openjdk-17-jdk \
openjdk-21-jdk \
openjdk-25-jdk \
&& rm -rf /var/lib/apt/lists/*
Expand Down