Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
4 changes: 0 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]
Expand Down
2 changes: 1 addition & 1 deletion docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
9 changes: 0 additions & 9 deletions tests/golden/expected_platforms.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 0 additions & 4 deletions tests/golden/expected_tags.txt
Original file line number Diff line number Diff line change
@@ -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)
10 changes: 0 additions & 10 deletions tests/golden/expected_tags_latest_weekly.txt
Original file line number Diff line number Diff line change
@@ -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)