diff --git a/Jenkinsfile b/Jenkinsfile index 7356b2088c..79ca1e9e06 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -119,16 +119,12 @@ stage('Build') { // This list can be updated with the following command: // make show | jq -r '.target | keys[]' | sort def images = [ - 'alpine_jdk17', 'alpine_jdk21', 'alpine_jdk25', - 'debian_jdk17', 'debian_jdk21', 'debian_jdk25', - 'debian-slim_jdk17', 'debian-slim_jdk21', 'debian-slim_jdk25', - 'rhel_jdk17', 'rhel_jdk21', 'rhel_jdk25', ] diff --git a/build-windows.yaml b/build-windows.yaml index 40f9954edb..1515a5397e 100644 --- a/build-windows.yaml +++ b/build-windows.yaml @@ -1,19 +1,4 @@ services: - jdk17: - image: ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}${SEPARATOR_LTS_PREFIX}jdk17-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION} - build: - context: ./ - dockerfile: ./windows/${WINDOWS_FLAVOR}/hotspot/Dockerfile - args: - COMMIT_SHA: ${COMMIT_SHA} - JAVA_HOME: "C:/openjdk-17" - JAVA_VERSION: 17.0.17_10 - WAR_SHA: ${WAR_SHA} - JENKINS_VERSION: ${JENKINS_VERSION} - WAR_URL: ${WAR_URL} - WINDOWS_VERSION: ${WINDOWS_VERSION} - tags: - - ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${JENKINS_VERSION}-jdk17-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION} jdk21: image: ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}${SEPARATOR_LTS_PREFIX}jdk21-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION} build: diff --git a/docker-bake.hcl b/docker-bake.hcl index e181611406..cc8a77faa3 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -4,7 +4,7 @@ variable "jdks_to_build_for_lts" { } variable "jdks_to_build_for_weekly" { - default = [17, 21, 25] + default = [21, 25] } variable "default_jdk" { diff --git a/tests/golden/expected_platforms.txt b/tests/golden/expected_platforms.txt index ba6a7f4b12..9cecd8e103 100644 --- a/tests/golden/expected_platforms.txt +++ b/tests/golden/expected_platforms.txt @@ -1,17 +1,11 @@ -alpine_jdk17:linux/amd64 alpine_jdk21:linux/amd64 alpine_jdk21:linux/arm64 alpine_jdk25:linux/amd64 alpine_jdk25:linux/arm64 -debian-slim_jdk17:linux/amd64 debian-slim_jdk21:linux/amd64 debian-slim_jdk21:linux/arm64 debian-slim_jdk25:linux/amd64 debian-slim_jdk25:linux/arm64 -debian_jdk17:linux/amd64 -debian_jdk17:linux/arm64 -debian_jdk17:linux/ppc64le -debian_jdk17:linux/s390x debian_jdk21:linux/amd64 debian_jdk21:linux/arm64 debian_jdk21:linux/ppc64le @@ -20,9 +14,6 @@ debian_jdk25:linux/amd64 debian_jdk25:linux/arm64 debian_jdk25:linux/ppc64le debian_jdk25:linux/s390x -rhel_jdk17:linux/amd64 -rhel_jdk17:linux/arm64 -rhel_jdk17:linux/ppc64le rhel_jdk21:linux/amd64 rhel_jdk21:linux/arm64 rhel_jdk21:linux/ppc64le diff --git a/tests/golden/expected_tags.txt b/tests/golden/expected_tags.txt index 66dae4205a..555e6bd1c7 100644 --- a/tests/golden/expected_tags.txt +++ b/tests/golden/expected_tags.txt @@ -1,15 +1,11 @@ docker.io/jenkins/jenkins:2.534 (debian_jdk21) docker.io/jenkins/jenkins:2.534-alpine (alpine_jdk21) -docker.io/jenkins/jenkins:2.534-alpine-jdk17 (alpine_jdk17) docker.io/jenkins/jenkins:2.534-alpine-jdk21 (alpine_jdk21) docker.io/jenkins/jenkins:2.534-alpine-jdk25 (alpine_jdk25) -docker.io/jenkins/jenkins:2.534-jdk17 (debian_jdk17) docker.io/jenkins/jenkins:2.534-jdk21 (debian_jdk21) docker.io/jenkins/jenkins:2.534-jdk25 (debian_jdk25) -docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk17 (rhel_jdk17) docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk21 (rhel_jdk21) docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk25 (rhel_jdk25) docker.io/jenkins/jenkins:2.534-slim (debian-slim_jdk21) -docker.io/jenkins/jenkins:2.534-slim-jdk17 (debian-slim_jdk17) docker.io/jenkins/jenkins:2.534-slim-jdk21 (debian-slim_jdk21) docker.io/jenkins/jenkins:2.534-slim-jdk25 (debian-slim_jdk25) diff --git a/tests/golden/expected_tags_latest_weekly.txt b/tests/golden/expected_tags_latest_weekly.txt index 5b4c64bfb6..22538ab512 100644 --- a/tests/golden/expected_tags_latest_weekly.txt +++ b/tests/golden/expected_tags_latest_weekly.txt @@ -1,36 +1,26 @@ docker.io/jenkins/jenkins:2.534 (debian_jdk21) docker.io/jenkins/jenkins:2.534-alpine (alpine_jdk21) -docker.io/jenkins/jenkins:2.534-alpine-jdk17 (alpine_jdk17) docker.io/jenkins/jenkins:2.534-alpine-jdk21 (alpine_jdk21) docker.io/jenkins/jenkins:2.534-alpine-jdk25 (alpine_jdk25) -docker.io/jenkins/jenkins:2.534-jdk17 (debian_jdk17) docker.io/jenkins/jenkins:2.534-jdk21 (debian_jdk21) docker.io/jenkins/jenkins:2.534-jdk25 (debian_jdk25) -docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk17 (rhel_jdk17) docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk21 (rhel_jdk21) docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk25 (rhel_jdk25) docker.io/jenkins/jenkins:2.534-slim (debian-slim_jdk21) -docker.io/jenkins/jenkins:2.534-slim-jdk17 (debian-slim_jdk17) docker.io/jenkins/jenkins:2.534-slim-jdk21 (debian-slim_jdk21) docker.io/jenkins/jenkins:2.534-slim-jdk25 (debian-slim_jdk25) docker.io/jenkins/jenkins:alpine (alpine_jdk21) -docker.io/jenkins/jenkins:alpine-jdk17 (alpine_jdk17) docker.io/jenkins/jenkins:alpine-jdk21 (alpine_jdk21) docker.io/jenkins/jenkins:alpine-jdk25 (alpine_jdk25) -docker.io/jenkins/jenkins:alpine3.23-jdk17 (alpine_jdk17) docker.io/jenkins/jenkins:alpine3.23-jdk21 (alpine_jdk21) docker.io/jenkins/jenkins:alpine3.23-jdk25 (alpine_jdk25) -docker.io/jenkins/jenkins:jdk17 (debian_jdk17) docker.io/jenkins/jenkins:jdk21 (debian_jdk21) docker.io/jenkins/jenkins:jdk25 (debian_jdk25) docker.io/jenkins/jenkins:latest (debian_jdk21) -docker.io/jenkins/jenkins:latest-jdk17 (debian_jdk17) docker.io/jenkins/jenkins:latest-jdk21 (debian_jdk21) docker.io/jenkins/jenkins:latest-jdk25 (debian_jdk25) -docker.io/jenkins/jenkins:rhel-ubi9-jdk17 (rhel_jdk17) docker.io/jenkins/jenkins:rhel-ubi9-jdk21 (rhel_jdk21) docker.io/jenkins/jenkins:rhel-ubi9-jdk25 (rhel_jdk25) docker.io/jenkins/jenkins:slim (debian-slim_jdk21) -docker.io/jenkins/jenkins:slim-jdk17 (debian-slim_jdk17) docker.io/jenkins/jenkins:slim-jdk21 (debian-slim_jdk21) docker.io/jenkins/jenkins:slim-jdk25 (debian-slim_jdk25)