Skip to content

Commit 487c134

Browse files
authored
feat: remove JDK17 from Weekly releases (#2179)
* chore: remove JDK17 from Weekly releases * update golden tags (the LTS one doesn't change as expected) * remove jdk17 from ci.jenkins.io builds (Weekly) * remove Windows JDK17 images
1 parent ca969da commit 487c134

File tree

6 files changed

+1
-43
lines changed

6 files changed

+1
-43
lines changed

Jenkinsfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,12 @@ stage('Build') {
119119
// This list can be updated with the following command:
120120
// make show | jq -r '.target | keys[]' | sort
121121
def images = [
122-
'alpine_jdk17',
123122
'alpine_jdk21',
124123
'alpine_jdk25',
125-
'debian_jdk17',
126124
'debian_jdk21',
127125
'debian_jdk25',
128-
'debian-slim_jdk17',
129126
'debian-slim_jdk21',
130127
'debian-slim_jdk25',
131-
'rhel_jdk17',
132128
'rhel_jdk21',
133129
'rhel_jdk25',
134130
]

build-windows.yaml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,4 @@
11
services:
2-
jdk17:
3-
image: ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}${SEPARATOR_LTS_PREFIX}jdk17-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
4-
build:
5-
context: ./
6-
dockerfile: ./windows/${WINDOWS_FLAVOR}/hotspot/Dockerfile
7-
args:
8-
COMMIT_SHA: ${COMMIT_SHA}
9-
JAVA_HOME: "C:/openjdk-17"
10-
JAVA_VERSION: 17.0.17_10
11-
WAR_SHA: ${WAR_SHA}
12-
JENKINS_VERSION: ${JENKINS_VERSION}
13-
WAR_URL: ${WAR_URL}
14-
WINDOWS_VERSION: ${WINDOWS_VERSION}
15-
tags:
16-
- ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${JENKINS_VERSION}-jdk17-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
172
jdk21:
183
image: ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}${SEPARATOR_LTS_PREFIX}jdk21-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
194
build:

docker-bake.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ variable "jdks_to_build_for_lts" {
44
}
55

66
variable "jdks_to_build_for_weekly" {
7-
default = [17, 21, 25]
7+
default = [21, 25]
88
}
99

1010
variable "default_jdk" {

tests/golden/expected_platforms.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
1-
alpine_jdk17:linux/amd64
21
alpine_jdk21:linux/amd64
32
alpine_jdk21:linux/arm64
43
alpine_jdk25:linux/amd64
54
alpine_jdk25:linux/arm64
6-
debian-slim_jdk17:linux/amd64
75
debian-slim_jdk21:linux/amd64
86
debian-slim_jdk21:linux/arm64
97
debian-slim_jdk25:linux/amd64
108
debian-slim_jdk25:linux/arm64
11-
debian_jdk17:linux/amd64
12-
debian_jdk17:linux/arm64
13-
debian_jdk17:linux/ppc64le
14-
debian_jdk17:linux/s390x
159
debian_jdk21:linux/amd64
1610
debian_jdk21:linux/arm64
1711
debian_jdk21:linux/ppc64le
@@ -20,9 +14,6 @@ debian_jdk25:linux/amd64
2014
debian_jdk25:linux/arm64
2115
debian_jdk25:linux/ppc64le
2216
debian_jdk25:linux/s390x
23-
rhel_jdk17:linux/amd64
24-
rhel_jdk17:linux/arm64
25-
rhel_jdk17:linux/ppc64le
2617
rhel_jdk21:linux/amd64
2718
rhel_jdk21:linux/arm64
2819
rhel_jdk21:linux/ppc64le

tests/golden/expected_tags.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
docker.io/jenkins/jenkins:2.534 (debian_jdk21)
22
docker.io/jenkins/jenkins:2.534-alpine (alpine_jdk21)
3-
docker.io/jenkins/jenkins:2.534-alpine-jdk17 (alpine_jdk17)
43
docker.io/jenkins/jenkins:2.534-alpine-jdk21 (alpine_jdk21)
54
docker.io/jenkins/jenkins:2.534-alpine-jdk25 (alpine_jdk25)
6-
docker.io/jenkins/jenkins:2.534-jdk17 (debian_jdk17)
75
docker.io/jenkins/jenkins:2.534-jdk21 (debian_jdk21)
86
docker.io/jenkins/jenkins:2.534-jdk25 (debian_jdk25)
9-
docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk17 (rhel_jdk17)
107
docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk21 (rhel_jdk21)
118
docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk25 (rhel_jdk25)
129
docker.io/jenkins/jenkins:2.534-slim (debian-slim_jdk21)
13-
docker.io/jenkins/jenkins:2.534-slim-jdk17 (debian-slim_jdk17)
1410
docker.io/jenkins/jenkins:2.534-slim-jdk21 (debian-slim_jdk21)
1511
docker.io/jenkins/jenkins:2.534-slim-jdk25 (debian-slim_jdk25)
Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,26 @@
11
docker.io/jenkins/jenkins:2.534 (debian_jdk21)
22
docker.io/jenkins/jenkins:2.534-alpine (alpine_jdk21)
3-
docker.io/jenkins/jenkins:2.534-alpine-jdk17 (alpine_jdk17)
43
docker.io/jenkins/jenkins:2.534-alpine-jdk21 (alpine_jdk21)
54
docker.io/jenkins/jenkins:2.534-alpine-jdk25 (alpine_jdk25)
6-
docker.io/jenkins/jenkins:2.534-jdk17 (debian_jdk17)
75
docker.io/jenkins/jenkins:2.534-jdk21 (debian_jdk21)
86
docker.io/jenkins/jenkins:2.534-jdk25 (debian_jdk25)
9-
docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk17 (rhel_jdk17)
107
docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk21 (rhel_jdk21)
118
docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk25 (rhel_jdk25)
129
docker.io/jenkins/jenkins:2.534-slim (debian-slim_jdk21)
13-
docker.io/jenkins/jenkins:2.534-slim-jdk17 (debian-slim_jdk17)
1410
docker.io/jenkins/jenkins:2.534-slim-jdk21 (debian-slim_jdk21)
1511
docker.io/jenkins/jenkins:2.534-slim-jdk25 (debian-slim_jdk25)
1612
docker.io/jenkins/jenkins:alpine (alpine_jdk21)
17-
docker.io/jenkins/jenkins:alpine-jdk17 (alpine_jdk17)
1813
docker.io/jenkins/jenkins:alpine-jdk21 (alpine_jdk21)
1914
docker.io/jenkins/jenkins:alpine-jdk25 (alpine_jdk25)
20-
docker.io/jenkins/jenkins:alpine3.23-jdk17 (alpine_jdk17)
2115
docker.io/jenkins/jenkins:alpine3.23-jdk21 (alpine_jdk21)
2216
docker.io/jenkins/jenkins:alpine3.23-jdk25 (alpine_jdk25)
23-
docker.io/jenkins/jenkins:jdk17 (debian_jdk17)
2417
docker.io/jenkins/jenkins:jdk21 (debian_jdk21)
2518
docker.io/jenkins/jenkins:jdk25 (debian_jdk25)
2619
docker.io/jenkins/jenkins:latest (debian_jdk21)
27-
docker.io/jenkins/jenkins:latest-jdk17 (debian_jdk17)
2820
docker.io/jenkins/jenkins:latest-jdk21 (debian_jdk21)
2921
docker.io/jenkins/jenkins:latest-jdk25 (debian_jdk25)
30-
docker.io/jenkins/jenkins:rhel-ubi9-jdk17 (rhel_jdk17)
3122
docker.io/jenkins/jenkins:rhel-ubi9-jdk21 (rhel_jdk21)
3223
docker.io/jenkins/jenkins:rhel-ubi9-jdk25 (rhel_jdk25)
3324
docker.io/jenkins/jenkins:slim (debian-slim_jdk21)
34-
docker.io/jenkins/jenkins:slim-jdk17 (debian-slim_jdk17)
3525
docker.io/jenkins/jenkins:slim-jdk21 (debian-slim_jdk21)
3626
docker.io/jenkins/jenkins:slim-jdk25 (debian-slim_jdk25)

0 commit comments

Comments
 (0)