Skip to content

breaking: drop Windows 2019 images #2370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarkEWaite merged 4 commits into from
Jun 15, 2026
Merged

breaking: drop Windows 2019 images #2370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
924d42a
feat: add Windows 2025 images
lemeurherve Jun 12, 2026
e0fa6e7
breaking: drop Windows 2019 images
lemeurherve Jun 12, 2026
d01a465
Merge branch 'master' into issue2368-remove-windows-2019
lemeurherve Jun 12, 2026
098ccab
Merge branch 'master' into issue2368-remove-windows-2019
lemeurherve Jun 12, 2026
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
1 change: 0 additions & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ stage('Build') {
echo '= bake target: linux'

def windowsImageTypes = [
'windowsservercore-ltsc2019',
'windowsservercore-ltsc2022',
'windowsservercore-ltsc2025',
]
Expand Down
2 changes: 1 addition & 1 deletion docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ variable "jdks_to_build" {
}

variable "windows_version_to_build" {
default = ["ltsc2019", "ltsc2022", "ltsc2025"]
default = ["ltsc2022", "ltsc2025"]
}

variable "default_jdk" {
Expand Down
2 changes: 0 additions & 2 deletions tests/golden/expected_platforms.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions tests/golden/expected_tags.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 0 additions & 7 deletions tests/golden/expected_tags_latest_lts.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -25,26 +22,22 @@ 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)
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)
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)
7 changes: 0 additions & 7 deletions tests/golden/expected_tags_latest_weekly.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,19 @@ 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)
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)
Expand All @@ -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)
Expand All @@ -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)
2 changes: 1 addition & 1 deletion tests/test_helpers.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}
Expand Down