Skip to content

Commit

Permalink
Remove Java 11 support (#1937)
Browse files Browse the repository at this point in the history
* Test LTS with 2.462.3

* Switch default build version to 2.479

* Remove Java 11 support

Jenkins weekly stopped supporting Java 11 with 2.463
https://www.jenkins.io/changelog/2.463/

Jenkins LTS stops Java 11 support with 2.479.1 30 Oct 2024

No longer generates container images for:

* AlmaLinux
* Alpine JDK 11
* Debian JDK 11
* Debian slim JDK 11
* Red Hat Universal Base Image 8
* Windows Server Core LTSC 2019 JDK 11

Move -strip-java-debug-attributes into jlink command line

Conditional no longer needed for that argument

Best reviewed with white space differences suppressed.

Tested with `make build test` on two different machines.

Confirmed the list of generated container images does not include any
Java 11 container, does not include any UBI 8 container, and does not
include any AlmaLinux container.

* Simplify docker compose in Windows

* Use correct debug attribute strip on Windows
  • Loading branch information
MarkEWaite authored Oct 6, 2024
1 parent 60d14cf commit 97b425c
Show file tree
Hide file tree
Showing 18 changed files with 201 additions and 850 deletions.
11 changes: 2 additions & 9 deletions .ci/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,9 @@ else
LATEST_WEEKLY="false"
fi

# Build all images including Java 11 if the version match latest LTS version
# TODO: remove when Java 11 is removed from LTS line
# See https://github.com/jenkinsci/docker/issues/1890
TARGET="linux"

if [[ "${JENKINS_VERSION}" == "${latest_lts_version}" ]]
then
LATEST_LTS="true"
TARGET="linux-lts-with-jdk11"
else
LATEST_LTS="false"
fi
Expand All @@ -90,7 +84,7 @@ fi

JENKINS_SHA="$(curl --disable --fail --silent --show-error --location "https://repo.jenkins-ci.org/releases/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war.sha256")"
COMMIT_SHA=$(git rev-parse HEAD)
export COMMIT_SHA JENKINS_VERSION JENKINS_SHA LATEST_WEEKLY LATEST_LTS TARGET
export COMMIT_SHA JENKINS_VERSION JENKINS_SHA LATEST_WEEKLY LATEST_LTS

cat <<EOF
Using the following settings:
Expand All @@ -100,7 +94,6 @@ Using the following settings:
* COMMIT_SHA: ${COMMIT_SHA}
* LATEST_WEEKLY: ${LATEST_WEEKLY}
* LATEST_LTS: ${LATEST_LTS}
* TARGET: ${TARGET}
EOF

docker buildx bake --file docker-bake.hcl "${build_opts[@]}" "${TARGET}"
docker buildx bake --file docker-bake.hcl "${build_opts[@]}" linux
2 changes: 1 addition & 1 deletion .github/workflows/sync-plugin-manager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Check if update is available
id: update
run: |
CURRENT_VERSION=$(docker buildx bake -f docker-bake.hcl --print alpine_jdk11 | jq -r ".target.alpine_jdk11.args.PLUGIN_CLI_VERSION")
CURRENT_VERSION=$(docker buildx bake -f docker-bake.hcl --print alpine_jdk17 | jq -r ".target.alpine_jdk17.args.PLUGIN_CLI_VERSION")
if [ "$CURRENT_VERSION" = "${{ steps.lts.outputs.next-version }}" ]; then
echo "available=false" >> $GITHUB_OUTPUT
else
Expand Down
Loading

0 comments on commit 97b425c

Please sign in to comment.