File tree Expand file tree Collapse file tree 5 files changed +3
-7
lines changed
org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer Expand file tree Collapse file tree 5 files changed +3
-7
lines changed Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ if (needSplittingFromWorkspace) {
4141def axes = [
4242 jenkinsVersions : [' lts' , ' latest' ],
4343 platforms : [' linux' ],
44- jdks : [17 , 21 , 25 ],
44+ jdks : [21 , 25 ],
4545 browsers : [' firefox' ],
4646]
4747
Original file line number Diff line number Diff line change 1313
1414trap ' docker-compose kill && docker-compose down' EXIT
1515
16- 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'
16+ 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'
1717status=$?
1818
1919exit $status
Original file line number Diff line number Diff line change @@ -16,7 +16,6 @@ RUN apt-get update \
1616 imagemagick \
1717 jq \
1818 lsb-release \
19- openjdk-17-jdk \
2019 openjdk-21-jdk \
2120 openjdk-25-jdk \
2221 openssh-client \
Original file line number Diff line number Diff line change @@ -4,9 +4,7 @@ set -uo pipefail
44trap ' s=$?; echo >&2 "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR
55
66# The selection used by update-alternatives for each java version
7- if [[ $1 == ' 17' ]]; then
8- selection=' 17-openjdk'
9- elif [[ $1 == ' 21' ]]; then
7+ if [[ $1 == ' 21' ]]; then
108 selection=' 21-openjdk'
119elif [[ $1 == ' 25' ]]; then
1210 selection=' 25-openjdk'
Original file line number Diff line number Diff line change @@ -12,7 +12,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
1212 openssh-server \
1313 git \
1414 zip \
15- openjdk-17-jdk \
1615 openjdk-21-jdk \
1716 openjdk-25-jdk \
1817 && rm -rf /var/lib/apt/lists/*
You can’t perform that action at this time.
0 commit comments