Skip to content

Commit 52d8ee8

Browse files
authored
breaking(windows): replace Windows Server Core 2019 by Windows Server Core 2022 (#2170)
* chore: remove unused `TOOLS_WINDOWS_VERSION` * feat(windows): replace Windows Server Core 2019 by Windows Server Core 2022
1 parent 25c0fa6 commit 52d8ee8

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ stage('Build') {
4747
withEnv(envVars) {
4848
echo '= bake target: linux'
4949

50-
def windowsImageTypes = ['windowsservercore-ltsc2019']
50+
def windowsImageTypes = ['windowsservercore-ltsc2022']
5151
for (anImageType in windowsImageTypes) {
5252
def imageType = anImageType
5353
builds[imageType] = {
54-
nodeWithTimeout('windows-2019') {
54+
nodeWithTimeout('windows-2022') {
5555
stage('Checkout') {
5656
checkout scm
5757
}

make.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ $ProgressPreference = 'SilentlyContinue' # Disable Progress bar for faster downl
1111

1212
$Repository = 'jenkins'
1313
$Organisation = 'jenkins4eval'
14-
$ImageType = 'windowsservercore-ltsc2019' # <WINDOWS_FLAVOR>-<WINDOWS_VERSION>
14+
$ImageType = 'windowsservercore-ltsc2022' # <WINDOWS_FLAVOR>-<WINDOWS_VERSION>
1515

1616
if(![String]::IsNullOrWhiteSpace($env:DOCKERHUB_REPO)) {
1717
$Repository = $env:DOCKERHUB_REPO

tests/test_helpers.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function Retry-Command {
6767

6868
function Get-SutImage {
6969
$DOCKERFILE = Get-EnvOrDefault 'DOCKERFILE' ''
70-
$IMAGENAME = Get-EnvOrDefault 'CONTROLLER_IMAGE' '' # Ex: jdk17-hotspot-windowsservercore-ltsc2019
70+
$IMAGENAME = Get-EnvOrDefault 'CONTROLLER_IMAGE' '' # Ex: jdk17-hotspot-windowsservercore-ltsc2022
7171

7272
$REAL_DOCKERFILE=Resolve-Path -Path "$PSScriptRoot/../${DOCKERFILE}"
7373

windows/windowsservercore/hotspot/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# hadolint shell=powershell
33

44
ARG JAVA_VERSION=17.0.17_10
5-
ARG WINDOWS_VERSION=ltsc2019
5+
ARG WINDOWS_VERSION=ltsc2022
66

77
FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION}" AS jre-build
88

0 commit comments

Comments
 (0)