Skip to content

Commit f4e8999

Browse files
authored
breaking: stop providing Windows 1809 images (#1152)
1 parent edfe994 commit f4e8999

File tree

9 files changed

+9
-87
lines changed

9 files changed

+9
-87
lines changed

Jenkinsfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ properties([
99
def agentSelector(String imageType, retryCounter) {
1010
def platform
1111
switch (imageType) {
12-
// nanoserver-1809, nanoserver-ltsc2019 and windowservercore-ltsc2019
13-
case ~/.*(1809|2019)/:
12+
// nanoserver-ltsc2019 and windowservercore-ltsc2019
13+
case ~/.*2019/:
1414
platform = 'windows-2019'
1515
break
1616

@@ -43,10 +43,8 @@ def agentSelector(String imageType, retryCounter) {
4343
def parallelStages = [failFast: false]
4444
[
4545
'linux',
46-
'nanoserver-1809',
4746
'nanoserver-ltsc2019',
4847
'nanoserver-ltsc2022',
49-
'windowsservercore-1809',
5048
'windowsservercore-ltsc2019',
5149
'windowsservercore-ltsc2022'
5250
].each { imageType ->

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -387,12 +387,10 @@ Add the `-DryRun` parameter to print out any build, publish or tests commands in
387387

388388
#### Building and testing a specific image
389389

390-
You can build (and test) only one image type by setting `-ImageType` to a combination of Windows flavors ("nanoserver" & "windowsservercore") and Windows versions ("1809", "ltsc2019", "ltsc2022").
390+
You can build (and test) only one image type by setting `-ImageType` to a combination of Windows flavors ("nanoserver" & "windowsservercore") and Windows versions ("ltsc2019", "ltsc2022").
391391

392392
Ex: `.\build.ps1 -ImageType 'nanoserver-ltsc2019'`
393393

394-
Warning: trying to build `windowsservercore-1809` will fail as there is no corresponding image from Microsoft.
395-
396394
You can also build (and test) only one agent type by setting `-AgentType` to either "agent" or "inbound-agent".
397395

398396
Ex: `.\build.ps1 -AgentType 'agent'`

README_agent.md

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -48,56 +48,7 @@ docker run -i --rm --name agent1 --init -v agent1-workdir:C:/Users/jenkins/Work
4848

4949
## Configurations
5050

51-
The image has several supported configurations, which can be accessed via the following tags:
52-
53-
* Linux Images:
54-
* Java 17 (default):
55-
* `jenkins/agent:latest`: Based on `debian:trixie-${builddate}`
56-
* Also tagged as:
57-
* `jenkins/agent:jdk17`
58-
* `jenkins/agent:trixie-jdk17`
59-
* `jenkins/agent:latest-trixie`
60-
* `jenkins/agent:latest-trixie-jdk17`
61-
* `jenkins/agent:latest-jdk17`
62-
* alpine (Small image based on Alpine Linux, based on `alpine:${version}`):
63-
* `jenkins/agent:alpine`
64-
* `jenkins/agent:alpine-jdk17`
65-
* `jenkins/agent:latest-alpine`
66-
* `jenkins/agent:latest-alpine-jdk17`
67-
* rhel-ubi9 (Based on Red Hat Universal Base Image 9)
68-
* `jenkins/agent:rhel-ubi9`
69-
* `jenkins/agent:rhel-ubi9-jdk17`
70-
* `jenkins/agent:latest-rhel-ubi9`
71-
* `jenkins/agent:latest-rhel-ubi9-jdk17`
72-
* Java 21:
73-
* trixie (Based on `debian:trixie-${builddate}`):
74-
* `jenkins/agent:trixie`
75-
* `jenkins/agent:trixie-jdk21`
76-
* `jenkins/agent:jdk21`
77-
* `jenkins/agent:latest-trixie-jdk21`
78-
* alpine (Small image based on Alpine Linux, based on `alpine:${version}`):
79-
* `jenkins/agent:alpine-jdk21`
80-
* `jenkins/agent:latest-alpine`
81-
* `jenkins/agent:latest-alpine-jdk21`
82-
* rhel-ubi9 (Based on Red Hat Universal Base Image 9)
83-
* `jenkins/agent:rhel-ubi9-jdk21`
84-
* `jenkins/agent:latest-rhel-ubi9-jdk21`
85-
86-
* Windows Images:
87-
* Java 17 (default):
88-
* Latest Jenkins agent version on Windows Nano Server and Java 17:
89-
* `jenkins/agent:jdk17-nanoserver-1809`
90-
* `jenkins/agent:jdk17-nanoserver-ltsc2019`
91-
* `jenkins/agent:jdk17-nanoserver-ltsc2022`
92-
* Java 21:
93-
* Latest Jenkins agent version on Windows Nano Server and Java 21:
94-
* `jenkins/agent:jdk21-nanoserver-1809`
95-
* `jenkins/agent:jdk21-nanoserver-ltsc2019`
96-
* `jenkins/agent:jdk21-nanoserver-ltsc2022`
97-
* Latest Jenkins agent version on Windows Server Core with Java 21:
98-
* `jenkins/agent:jdk21-windowsservercore-1809`
99-
* `jenkins/agent:jdk21-windowsservercore-ltsc2019`
100-
* `jenkins/agent:jdk21-windowsservercore-ltsc2022`
51+
The image has several supported configurations, which can be accessed via the lists of tags that can be consulted at https://github.com/jenkinsci/docker-agents/tree/master/tests/golden/
10152

10253
The file [docker-bake.hcl](https://github.com/jenkinsci/docker-agents/blob/master/docker-bake.hcl) defines all the configuration for Linux images and their associated tags.
10354

docker-bake.hcl

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -266,16 +266,13 @@ function "debian_platforms" {
266266
}
267267

268268
# Return array of Windows version(s) to build
269-
# There is no mcr.microsoft.com/windows/servercore:1809 image
270269
# Can be overriden by setting WINDOWS_VERSION_OVERRIDE to a specific Windows version
271-
# Ex: WINDOWS_VERSION_OVERRIDE=1809 docker buildx bake windows
270+
# Ex: WINDOWS_VERSION_OVERRIDE=ltsc2025 docker buildx bake windows
272271
function "windowsversions" {
273272
params = [flavor]
274273
result = (notequal(WINDOWS_VERSION_OVERRIDE, "")
275274
? [WINDOWS_VERSION_OVERRIDE]
276-
: (equal(flavor, "windowsservercore")
277-
? ["ltsc2019", "ltsc2022"]
278-
: ["1809", "ltsc2019", "ltsc2022"]))
275+
: ["ltsc2019", "ltsc2022"])
279276
}
280277

281278
# Return array of agent type(s) to build

tests/agent.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Import-Module -DisableNameChecking -Force $PSScriptRoot/test_helpers.psm1
22

3-
$global:IMAGE_NAME = Get-EnvOrDefault 'IMAGE_NAME' '' # Ex: jenkins/agent:jdk17-nanoserver-1809
3+
$global:IMAGE_NAME = Get-EnvOrDefault 'IMAGE_NAME' '' # Ex: jenkins/agent:ltsc2022
44
$global:VERSION = Get-EnvOrDefault 'VERSION' ''
55
$global:JAVA_VERSION = Get-EnvOrDefault 'JAVA_VERSION' ''
66

tests/golden/expected_tags_windows.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,23 @@
1-
docker.io/jenkins/agent:jdk17-nanoserver-1809
21
docker.io/jenkins/agent:jdk17-nanoserver-ltsc2019
32
docker.io/jenkins/agent:jdk17-nanoserver-ltsc2022
43
docker.io/jenkins/agent:jdk17-windowsservercore-ltsc2019
54
docker.io/jenkins/agent:jdk17-windowsservercore-ltsc2022
6-
docker.io/jenkins/agent:jdk21-nanoserver-1809
75
docker.io/jenkins/agent:jdk21-nanoserver-ltsc2019
86
docker.io/jenkins/agent:jdk21-nanoserver-ltsc2022
97
docker.io/jenkins/agent:jdk21-windowsservercore-ltsc2019
108
docker.io/jenkins/agent:jdk21-windowsservercore-ltsc2022
11-
docker.io/jenkins/agent:jdk25-nanoserver-1809
129
docker.io/jenkins/agent:jdk25-nanoserver-ltsc2019
1310
docker.io/jenkins/agent:jdk25-nanoserver-ltsc2022
1411
docker.io/jenkins/agent:jdk25-windowsservercore-ltsc2019
1512
docker.io/jenkins/agent:jdk25-windowsservercore-ltsc2022
16-
docker.io/jenkins/inbound-agent:jdk17-nanoserver-1809
1713
docker.io/jenkins/inbound-agent:jdk17-nanoserver-ltsc2019
1814
docker.io/jenkins/inbound-agent:jdk17-nanoserver-ltsc2022
1915
docker.io/jenkins/inbound-agent:jdk17-windowsservercore-ltsc2019
2016
docker.io/jenkins/inbound-agent:jdk17-windowsservercore-ltsc2022
21-
docker.io/jenkins/inbound-agent:jdk21-nanoserver-1809
2217
docker.io/jenkins/inbound-agent:jdk21-nanoserver-ltsc2019
2318
docker.io/jenkins/inbound-agent:jdk21-nanoserver-ltsc2022
2419
docker.io/jenkins/inbound-agent:jdk21-windowsservercore-ltsc2019
2520
docker.io/jenkins/inbound-agent:jdk21-windowsservercore-ltsc2022
26-
docker.io/jenkins/inbound-agent:jdk25-nanoserver-1809
2721
docker.io/jenkins/inbound-agent:jdk25-nanoserver-ltsc2019
2822
docker.io/jenkins/inbound-agent:jdk25-nanoserver-ltsc2022
2923
docker.io/jenkins/inbound-agent:jdk25-windowsservercore-ltsc2019

tests/golden/expected_tags_windows_on_tag.txt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,63 @@
1-
docker.io/jenkins/agent:3355.v388858a_47b_33-1-jdk17-nanoserver-1809
21
docker.io/jenkins/agent:3355.v388858a_47b_33-1-jdk17-nanoserver-ltsc2019
32
docker.io/jenkins/agent:3355.v388858a_47b_33-1-jdk17-nanoserver-ltsc2022
43
docker.io/jenkins/agent:3355.v388858a_47b_33-1-jdk17-windowsservercore-ltsc2019
54
docker.io/jenkins/agent:3355.v388858a_47b_33-1-jdk17-windowsservercore-ltsc2022
6-
docker.io/jenkins/agent:3355.v388858a_47b_33-1-jdk21-nanoserver-1809
75
docker.io/jenkins/agent:3355.v388858a_47b_33-1-jdk21-nanoserver-ltsc2019
86
docker.io/jenkins/agent:3355.v388858a_47b_33-1-jdk21-nanoserver-ltsc2022
97
docker.io/jenkins/agent:3355.v388858a_47b_33-1-jdk21-windowsservercore-ltsc2019
108
docker.io/jenkins/agent:3355.v388858a_47b_33-1-jdk21-windowsservercore-ltsc2022
11-
docker.io/jenkins/agent:3355.v388858a_47b_33-1-jdk25-nanoserver-1809
129
docker.io/jenkins/agent:3355.v388858a_47b_33-1-jdk25-nanoserver-ltsc2019
1310
docker.io/jenkins/agent:3355.v388858a_47b_33-1-jdk25-nanoserver-ltsc2022
1411
docker.io/jenkins/agent:3355.v388858a_47b_33-1-jdk25-windowsservercore-ltsc2019
1512
docker.io/jenkins/agent:3355.v388858a_47b_33-1-jdk25-windowsservercore-ltsc2022
16-
docker.io/jenkins/agent:3355.v388858a_47b_33-1-nanoserver-1809
1713
docker.io/jenkins/agent:3355.v388858a_47b_33-1-nanoserver-ltsc2019
1814
docker.io/jenkins/agent:3355.v388858a_47b_33-1-nanoserver-ltsc2022
1915
docker.io/jenkins/agent:3355.v388858a_47b_33-1-windowsservercore-ltsc2019
2016
docker.io/jenkins/agent:3355.v388858a_47b_33-1-windowsservercore-ltsc2022
21-
docker.io/jenkins/agent:jdk17-nanoserver-1809
2217
docker.io/jenkins/agent:jdk17-nanoserver-ltsc2019
2318
docker.io/jenkins/agent:jdk17-nanoserver-ltsc2022
2419
docker.io/jenkins/agent:jdk17-windowsservercore-ltsc2019
2520
docker.io/jenkins/agent:jdk17-windowsservercore-ltsc2022
26-
docker.io/jenkins/agent:jdk21-nanoserver-1809
2721
docker.io/jenkins/agent:jdk21-nanoserver-ltsc2019
2822
docker.io/jenkins/agent:jdk21-nanoserver-ltsc2022
2923
docker.io/jenkins/agent:jdk21-windowsservercore-ltsc2019
3024
docker.io/jenkins/agent:jdk21-windowsservercore-ltsc2022
31-
docker.io/jenkins/agent:jdk25-nanoserver-1809
3225
docker.io/jenkins/agent:jdk25-nanoserver-ltsc2019
3326
docker.io/jenkins/agent:jdk25-nanoserver-ltsc2022
3427
docker.io/jenkins/agent:jdk25-windowsservercore-ltsc2019
3528
docker.io/jenkins/agent:jdk25-windowsservercore-ltsc2022
36-
docker.io/jenkins/agent:nanoserver-1809
3729
docker.io/jenkins/agent:nanoserver-ltsc2019
3830
docker.io/jenkins/agent:nanoserver-ltsc2022
3931
docker.io/jenkins/agent:windowsservercore-ltsc2019
4032
docker.io/jenkins/agent:windowsservercore-ltsc2022
41-
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-jdk17-nanoserver-1809
4233
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-jdk17-nanoserver-ltsc2019
4334
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-jdk17-nanoserver-ltsc2022
4435
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-jdk17-windowsservercore-ltsc2019
4536
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-jdk17-windowsservercore-ltsc2022
46-
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-jdk21-nanoserver-1809
4737
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-jdk21-nanoserver-ltsc2019
4838
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-jdk21-nanoserver-ltsc2022
4939
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-jdk21-windowsservercore-ltsc2019
5040
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-jdk21-windowsservercore-ltsc2022
51-
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-jdk25-nanoserver-1809
5241
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-jdk25-nanoserver-ltsc2019
5342
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-jdk25-nanoserver-ltsc2022
5443
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-jdk25-windowsservercore-ltsc2019
5544
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-jdk25-windowsservercore-ltsc2022
56-
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-nanoserver-1809
5745
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-nanoserver-ltsc2019
5846
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-nanoserver-ltsc2022
5947
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-windowsservercore-ltsc2019
6048
docker.io/jenkins/inbound-agent:3355.v388858a_47b_33-1-windowsservercore-ltsc2022
61-
docker.io/jenkins/inbound-agent:jdk17-nanoserver-1809
6249
docker.io/jenkins/inbound-agent:jdk17-nanoserver-ltsc2019
6350
docker.io/jenkins/inbound-agent:jdk17-nanoserver-ltsc2022
6451
docker.io/jenkins/inbound-agent:jdk17-windowsservercore-ltsc2019
6552
docker.io/jenkins/inbound-agent:jdk17-windowsservercore-ltsc2022
66-
docker.io/jenkins/inbound-agent:jdk21-nanoserver-1809
6753
docker.io/jenkins/inbound-agent:jdk21-nanoserver-ltsc2019
6854
docker.io/jenkins/inbound-agent:jdk21-nanoserver-ltsc2022
6955
docker.io/jenkins/inbound-agent:jdk21-windowsservercore-ltsc2019
7056
docker.io/jenkins/inbound-agent:jdk21-windowsservercore-ltsc2022
71-
docker.io/jenkins/inbound-agent:jdk25-nanoserver-1809
7257
docker.io/jenkins/inbound-agent:jdk25-nanoserver-ltsc2019
7358
docker.io/jenkins/inbound-agent:jdk25-nanoserver-ltsc2022
7459
docker.io/jenkins/inbound-agent:jdk25-windowsservercore-ltsc2019
7560
docker.io/jenkins/inbound-agent:jdk25-windowsservercore-ltsc2022
76-
docker.io/jenkins/inbound-agent:nanoserver-1809
7761
docker.io/jenkins/inbound-agent:nanoserver-ltsc2019
7862
docker.io/jenkins/inbound-agent:nanoserver-ltsc2022
7963
docker.io/jenkins/inbound-agent:windowsservercore-ltsc2019

tests/inbound-agent.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Import-Module -DisableNameChecking -Force $PSScriptRoot/test_helpers.psm1
22

3-
$global:IMAGE_NAME = Get-EnvOrDefault 'IMAGE_NAME' '' # Ex: jenkins/inbound-agent:jdk17-nanoserver-1809
3+
$global:IMAGE_NAME = Get-EnvOrDefault 'IMAGE_NAME' '' # Ex: jenkins/inbound-agent:ltsc2022
44
$global:VERSION = Get-EnvOrDefault 'VERSION' ''
55
$global:JAVA_VERSION = Get-EnvOrDefault 'JAVA_VERSION' ''
66

tests/netcat-helper/Dockerfile-windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
# THE SOFTWARE.
2424

2525
# Available tags: https://mcr.microsoft.com/v2/windows/servercore/tags/list
26-
ARG WINDOWS_VERSION_TAG=1809
26+
ARG WINDOWS_VERSION_TAG=ltsc2022
2727
FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION_TAG}"
2828

2929
SHELL ["powershell.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

0 commit comments

Comments
 (0)