From 924d42aba7a4e2365350763d81e5edb391b59eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Fri, 12 Jun 2026 12:45:26 +0200 Subject: [PATCH 1/2] feat: add Windows 2025 images --- Jenkinsfile | 3 ++- docker-bake.hcl | 2 +- tests/golden/expected_platforms.txt | 2 ++ tests/golden/expected_tags.txt | 3 +++ tests/golden/expected_tags_latest_lts.txt | 7 +++++++ tests/golden/expected_tags_latest_weekly.txt | 7 +++++++ 6 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 50bf297fe1..28c77c2908 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,7 +49,8 @@ stage('Build') { def windowsImageTypes = [ 'windowsservercore-ltsc2019', - 'windowsservercore-ltsc2022' + 'windowsservercore-ltsc2022', + 'windowsservercore-ltsc2025' ] for (anImageType in windowsImageTypes) { def imageType = anImageType diff --git a/docker-bake.hcl b/docker-bake.hcl index 71d367fe68..6846292019 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -4,7 +4,7 @@ variable "jdks_to_build" { } variable "windows_version_to_build" { - default = ["ltsc2019", "ltsc2022"] + default = ["ltsc2019", "ltsc2022", "ltsc2025"] } variable "default_jdk" { diff --git a/tests/golden/expected_platforms.txt b/tests/golden/expected_platforms.txt index beff81eee5..bed8578646 100644 --- a/tests/golden/expected_platforms.txt +++ b/tests/golden/expected_platforms.txt @@ -28,3 +28,5 @@ windowsservercore-ltsc2019_jdk21:windows/amd64 windowsservercore-ltsc2019_jdk25:windows/amd64 windowsservercore-ltsc2022_jdk21:windows/amd64 windowsservercore-ltsc2022_jdk25:windows/amd64 +windowsservercore-ltsc2025_jdk21:windows/amd64 +windowsservercore-ltsc2025_jdk25:windows/amd64 diff --git a/tests/golden/expected_tags.txt b/tests/golden/expected_tags.txt index ffb413f006..cc28a023c5 100644 --- a/tests/golden/expected_tags.txt +++ b/tests/golden/expected_tags.txt @@ -4,12 +4,15 @@ docker.io/jenkins/jenkins:2.567-alpine-jdk21 (alpine_jdk21) docker.io/jenkins/jenkins:2.567-alpine-jdk25 (alpine_jdk25) docker.io/jenkins/jenkins:2.567-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:2.567-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) +docker.io/jenkins/jenkins:2.567-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:2.567-jdk21 (debian_jdk21) docker.io/jenkins/jenkins:2.567-jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:2.567-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) +docker.io/jenkins/jenkins:2.567-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:2.567-jdk25 (debian_jdk25) docker.io/jenkins/jenkins:2.567-jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk25) docker.io/jenkins/jenkins:2.567-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25) +docker.io/jenkins/jenkins:2.567-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25) docker.io/jenkins/jenkins:2.567-rhel-ubi9-jdk21 (rhel_jdk21) docker.io/jenkins/jenkins:2.567-rhel-ubi9-jdk25 (rhel_jdk25) docker.io/jenkins/jenkins:2.567-slim (debian-slim_jdk21) diff --git a/tests/golden/expected_tags_latest_lts.txt b/tests/golden/expected_tags_latest_lts.txt index e425319cae..da5d1ec2ee 100644 --- a/tests/golden/expected_tags_latest_lts.txt +++ b/tests/golden/expected_tags_latest_lts.txt @@ -4,12 +4,15 @@ docker.io/jenkins/jenkins:2.555.1-alpine-jdk21 (alpine_jdk21) docker.io/jenkins/jenkins:2.555.1-alpine-jdk25 (alpine_jdk25) docker.io/jenkins/jenkins:2.555.1-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:2.555.1-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) +docker.io/jenkins/jenkins:2.555.1-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:2.555.1-jdk21 (debian_jdk21) docker.io/jenkins/jenkins:2.555.1-jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:2.555.1-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) +docker.io/jenkins/jenkins:2.555.1-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:2.555.1-jdk25 (debian_jdk25) docker.io/jenkins/jenkins:2.555.1-jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk25) docker.io/jenkins/jenkins:2.555.1-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25) +docker.io/jenkins/jenkins:2.555.1-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25) docker.io/jenkins/jenkins:2.555.1-lts (debian_jdk21) docker.io/jenkins/jenkins:2.555.1-lts-alpine (alpine_jdk21) docker.io/jenkins/jenkins:2.555.1-lts-jdk21 (debian_jdk21) @@ -24,6 +27,7 @@ docker.io/jenkins/jenkins:2.555.1-slim-jdk21 (debian-slim_jdk21) docker.io/jenkins/jenkins:2.555.1-slim-jdk25 (debian-slim_jdk25) docker.io/jenkins/jenkins:2.555.1-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:2.555.1-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) +docker.io/jenkins/jenkins:2.555.1-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:lts (debian_jdk21) docker.io/jenkins/jenkins:lts-alpine (alpine_jdk21) docker.io/jenkins/jenkins:lts-alpine-jdk21 (alpine_jdk21) @@ -31,9 +35,11 @@ docker.io/jenkins/jenkins:lts-alpine-jdk25 (alpine_jdk25) docker.io/jenkins/jenkins:lts-jdk21 (debian_jdk21) docker.io/jenkins/jenkins:lts-jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:lts-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) +docker.io/jenkins/jenkins:lts-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:lts-jdk25 (debian_jdk25) docker.io/jenkins/jenkins:lts-jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk25) docker.io/jenkins/jenkins:lts-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25) +docker.io/jenkins/jenkins:lts-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25) docker.io/jenkins/jenkins:lts-rhel-ubi9-jdk21 (rhel_jdk21) docker.io/jenkins/jenkins:lts-rhel-ubi9-jdk25 (rhel_jdk25) docker.io/jenkins/jenkins:lts-slim (debian-slim_jdk21) @@ -41,3 +47,4 @@ docker.io/jenkins/jenkins:lts-slim-jdk21 (debian-slim_jdk21) docker.io/jenkins/jenkins:lts-slim-jdk25 (debian-slim_jdk25) docker.io/jenkins/jenkins:lts-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:lts-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) +docker.io/jenkins/jenkins:lts-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) diff --git a/tests/golden/expected_tags_latest_weekly.txt b/tests/golden/expected_tags_latest_weekly.txt index ee537b0388..84731663f6 100644 --- a/tests/golden/expected_tags_latest_weekly.txt +++ b/tests/golden/expected_tags_latest_weekly.txt @@ -4,12 +4,15 @@ docker.io/jenkins/jenkins:2.567-alpine-jdk21 (alpine_jdk21) docker.io/jenkins/jenkins:2.567-alpine-jdk25 (alpine_jdk25) docker.io/jenkins/jenkins:2.567-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:2.567-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) +docker.io/jenkins/jenkins:2.567-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:2.567-jdk21 (debian_jdk21) docker.io/jenkins/jenkins:2.567-jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:2.567-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) +docker.io/jenkins/jenkins:2.567-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:2.567-jdk25 (debian_jdk25) docker.io/jenkins/jenkins:2.567-jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk25) docker.io/jenkins/jenkins:2.567-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25) +docker.io/jenkins/jenkins:2.567-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25) docker.io/jenkins/jenkins:2.567-rhel-ubi9-jdk21 (rhel_jdk21) docker.io/jenkins/jenkins:2.567-rhel-ubi9-jdk25 (rhel_jdk25) docker.io/jenkins/jenkins:2.567-slim (debian-slim_jdk21) @@ -17,6 +20,7 @@ docker.io/jenkins/jenkins:2.567-slim-jdk21 (debian-slim_jdk21) docker.io/jenkins/jenkins:2.567-slim-jdk25 (debian-slim_jdk25) docker.io/jenkins/jenkins:2.567-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:2.567-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) +docker.io/jenkins/jenkins:2.567-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:alpine (alpine_jdk21) docker.io/jenkins/jenkins:alpine-jdk21 (alpine_jdk21) docker.io/jenkins/jenkins:alpine-jdk25 (alpine_jdk25) @@ -25,9 +29,11 @@ docker.io/jenkins/jenkins:alpine3.24-jdk25 (alpine_jdk25) docker.io/jenkins/jenkins:jdk21 (debian_jdk21) docker.io/jenkins/jenkins:jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) +docker.io/jenkins/jenkins:jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:jdk25 (debian_jdk25) docker.io/jenkins/jenkins:jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk25) docker.io/jenkins/jenkins:jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25) +docker.io/jenkins/jenkins:jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25) docker.io/jenkins/jenkins:latest (debian_jdk21) docker.io/jenkins/jenkins:latest-jdk21 (debian_jdk21) docker.io/jenkins/jenkins:latest-jdk25 (debian_jdk25) @@ -38,3 +44,4 @@ docker.io/jenkins/jenkins:slim-jdk21 (debian-slim_jdk21) docker.io/jenkins/jenkins:slim-jdk25 (debian-slim_jdk25) docker.io/jenkins/jenkins:windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) +docker.io/jenkins/jenkins:windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) From e0fa6e7feabe3f774c31bae0eeaf15f82f204649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Fri, 12 Jun 2026 12:51:35 +0200 Subject: [PATCH 2/2] breaking: drop Windows 2019 images --- Jenkinsfile | 1 - docker-bake.hcl | 2 +- tests/golden/expected_platforms.txt | 2 -- tests/golden/expected_tags.txt | 3 --- tests/golden/expected_tags_latest_lts.txt | 7 ------- tests/golden/expected_tags_latest_weekly.txt | 7 ------- tests/test_helpers.psm1 | 2 +- 7 files changed, 2 insertions(+), 22 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 28c77c2908..25e0033078 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,7 +48,6 @@ stage('Build') { echo '= bake target: linux' def windowsImageTypes = [ - 'windowsservercore-ltsc2019', 'windowsservercore-ltsc2022', 'windowsservercore-ltsc2025' ] diff --git a/docker-bake.hcl b/docker-bake.hcl index 6846292019..c76e7f9bd1 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -4,7 +4,7 @@ variable "jdks_to_build" { } variable "windows_version_to_build" { - default = ["ltsc2019", "ltsc2022", "ltsc2025"] + default = ["ltsc2022", "ltsc2025"] } variable "default_jdk" { diff --git a/tests/golden/expected_platforms.txt b/tests/golden/expected_platforms.txt index bed8578646..4f9e5dc475 100644 --- a/tests/golden/expected_platforms.txt +++ b/tests/golden/expected_platforms.txt @@ -24,8 +24,6 @@ rhel_jdk21:linux/ppc64le rhel_jdk25:linux/amd64 rhel_jdk25:linux/arm64 rhel_jdk25:linux/ppc64le -windowsservercore-ltsc2019_jdk21:windows/amd64 -windowsservercore-ltsc2019_jdk25:windows/amd64 windowsservercore-ltsc2022_jdk21:windows/amd64 windowsservercore-ltsc2022_jdk25:windows/amd64 windowsservercore-ltsc2025_jdk21:windows/amd64 diff --git a/tests/golden/expected_tags.txt b/tests/golden/expected_tags.txt index cc28a023c5..065474e059 100644 --- a/tests/golden/expected_tags.txt +++ b/tests/golden/expected_tags.txt @@ -2,15 +2,12 @@ docker.io/jenkins/jenkins:2.567 (debian_jdk21) docker.io/jenkins/jenkins:2.567-alpine (alpine_jdk21) docker.io/jenkins/jenkins:2.567-alpine-jdk21 (alpine_jdk21) docker.io/jenkins/jenkins:2.567-alpine-jdk25 (alpine_jdk25) -docker.io/jenkins/jenkins:2.567-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:2.567-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) docker.io/jenkins/jenkins:2.567-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:2.567-jdk21 (debian_jdk21) -docker.io/jenkins/jenkins:2.567-jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:2.567-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) docker.io/jenkins/jenkins:2.567-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:2.567-jdk25 (debian_jdk25) -docker.io/jenkins/jenkins:2.567-jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk25) docker.io/jenkins/jenkins:2.567-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25) docker.io/jenkins/jenkins:2.567-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25) docker.io/jenkins/jenkins:2.567-rhel-ubi9-jdk21 (rhel_jdk21) diff --git a/tests/golden/expected_tags_latest_lts.txt b/tests/golden/expected_tags_latest_lts.txt index da5d1ec2ee..e1f287c453 100644 --- a/tests/golden/expected_tags_latest_lts.txt +++ b/tests/golden/expected_tags_latest_lts.txt @@ -2,15 +2,12 @@ docker.io/jenkins/jenkins:2.555.1 (debian_jdk21) docker.io/jenkins/jenkins:2.555.1-alpine (alpine_jdk21) docker.io/jenkins/jenkins:2.555.1-alpine-jdk21 (alpine_jdk21) docker.io/jenkins/jenkins:2.555.1-alpine-jdk25 (alpine_jdk25) -docker.io/jenkins/jenkins:2.555.1-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:2.555.1-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) docker.io/jenkins/jenkins:2.555.1-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:2.555.1-jdk21 (debian_jdk21) -docker.io/jenkins/jenkins:2.555.1-jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:2.555.1-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) docker.io/jenkins/jenkins:2.555.1-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:2.555.1-jdk25 (debian_jdk25) -docker.io/jenkins/jenkins:2.555.1-jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk25) docker.io/jenkins/jenkins:2.555.1-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25) docker.io/jenkins/jenkins:2.555.1-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25) docker.io/jenkins/jenkins:2.555.1-lts (debian_jdk21) @@ -25,7 +22,6 @@ docker.io/jenkins/jenkins:2.555.1-rhel-ubi9-jdk25 (rhel_jdk25) docker.io/jenkins/jenkins:2.555.1-slim (debian-slim_jdk21) docker.io/jenkins/jenkins:2.555.1-slim-jdk21 (debian-slim_jdk21) docker.io/jenkins/jenkins:2.555.1-slim-jdk25 (debian-slim_jdk25) -docker.io/jenkins/jenkins:2.555.1-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:2.555.1-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) docker.io/jenkins/jenkins:2.555.1-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:lts (debian_jdk21) @@ -33,11 +29,9 @@ docker.io/jenkins/jenkins:lts-alpine (alpine_jdk21) docker.io/jenkins/jenkins:lts-alpine-jdk21 (alpine_jdk21) docker.io/jenkins/jenkins:lts-alpine-jdk25 (alpine_jdk25) docker.io/jenkins/jenkins:lts-jdk21 (debian_jdk21) -docker.io/jenkins/jenkins:lts-jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:lts-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) docker.io/jenkins/jenkins:lts-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:lts-jdk25 (debian_jdk25) -docker.io/jenkins/jenkins:lts-jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk25) docker.io/jenkins/jenkins:lts-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25) docker.io/jenkins/jenkins:lts-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25) docker.io/jenkins/jenkins:lts-rhel-ubi9-jdk21 (rhel_jdk21) @@ -45,6 +39,5 @@ docker.io/jenkins/jenkins:lts-rhel-ubi9-jdk25 (rhel_jdk25) docker.io/jenkins/jenkins:lts-slim (debian-slim_jdk21) docker.io/jenkins/jenkins:lts-slim-jdk21 (debian-slim_jdk21) docker.io/jenkins/jenkins:lts-slim-jdk25 (debian-slim_jdk25) -docker.io/jenkins/jenkins:lts-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:lts-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) docker.io/jenkins/jenkins:lts-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) diff --git a/tests/golden/expected_tags_latest_weekly.txt b/tests/golden/expected_tags_latest_weekly.txt index 84731663f6..fe8b260301 100644 --- a/tests/golden/expected_tags_latest_weekly.txt +++ b/tests/golden/expected_tags_latest_weekly.txt @@ -2,15 +2,12 @@ docker.io/jenkins/jenkins:2.567 (debian_jdk21) docker.io/jenkins/jenkins:2.567-alpine (alpine_jdk21) docker.io/jenkins/jenkins:2.567-alpine-jdk21 (alpine_jdk21) docker.io/jenkins/jenkins:2.567-alpine-jdk25 (alpine_jdk25) -docker.io/jenkins/jenkins:2.567-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:2.567-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) docker.io/jenkins/jenkins:2.567-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:2.567-jdk21 (debian_jdk21) -docker.io/jenkins/jenkins:2.567-jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:2.567-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) docker.io/jenkins/jenkins:2.567-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:2.567-jdk25 (debian_jdk25) -docker.io/jenkins/jenkins:2.567-jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk25) docker.io/jenkins/jenkins:2.567-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25) docker.io/jenkins/jenkins:2.567-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25) docker.io/jenkins/jenkins:2.567-rhel-ubi9-jdk21 (rhel_jdk21) @@ -18,7 +15,6 @@ docker.io/jenkins/jenkins:2.567-rhel-ubi9-jdk25 (rhel_jdk25) docker.io/jenkins/jenkins:2.567-slim (debian-slim_jdk21) docker.io/jenkins/jenkins:2.567-slim-jdk21 (debian-slim_jdk21) docker.io/jenkins/jenkins:2.567-slim-jdk25 (debian-slim_jdk25) -docker.io/jenkins/jenkins:2.567-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:2.567-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) docker.io/jenkins/jenkins:2.567-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:alpine (alpine_jdk21) @@ -27,11 +23,9 @@ docker.io/jenkins/jenkins:alpine-jdk25 (alpine_jdk25) docker.io/jenkins/jenkins:alpine3.24-jdk21 (alpine_jdk21) docker.io/jenkins/jenkins:alpine3.24-jdk25 (alpine_jdk25) docker.io/jenkins/jenkins:jdk21 (debian_jdk21) -docker.io/jenkins/jenkins:jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) docker.io/jenkins/jenkins:jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:jdk25 (debian_jdk25) -docker.io/jenkins/jenkins:jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk25) docker.io/jenkins/jenkins:jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25) docker.io/jenkins/jenkins:jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25) docker.io/jenkins/jenkins:latest (debian_jdk21) @@ -42,6 +36,5 @@ docker.io/jenkins/jenkins:rhel-ubi9-jdk25 (rhel_jdk25) docker.io/jenkins/jenkins:slim (debian-slim_jdk21) docker.io/jenkins/jenkins:slim-jdk21 (debian-slim_jdk21) docker.io/jenkins/jenkins:slim-jdk25 (debian-slim_jdk25) -docker.io/jenkins/jenkins:windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21) docker.io/jenkins/jenkins:windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) docker.io/jenkins/jenkins:windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) diff --git a/tests/test_helpers.psm1 b/tests/test_helpers.psm1 index 86197e5b47..f025b4eb55 100644 --- a/tests/test_helpers.psm1 +++ b/tests/test_helpers.psm1 @@ -106,7 +106,7 @@ function Run-Program($cmd, $params, $verbose=$false) { } function Build-Docker($tag) { - $windowsVersion = '2019' + $windowsVersion = '2022' if ($tag -match 'ltsc(\d+)$') { $windowsVersion = $matches[1] }