Skip to content

Commit ae0795a

Browse files
authored
Merge pull request moby#42765 from thaJeztah/windows_2022_ltsc
Jenkinsfile: windows 2022 LTSC mcr.microsoft.com/windows/servercore:ltsc2022
2 parents c404041 + d7abbd0 commit ae0795a

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

Jenkinsfile

+8-10
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pipeline {
1818
booleanParam(name: 'ppc64le', defaultValue: false, description: 'PowerPC (ppc64le) Build/Test')
1919
booleanParam(name: 'windowsRS1', defaultValue: false, description: 'Windows 2016 (RS1) Build/Test')
2020
booleanParam(name: 'windowsRS5', defaultValue: true, description: 'Windows 2019 (RS5) Build/Test')
21-
booleanParam(name: 'windows2022', defaultValue: true, description: 'Windows 2022 (SAC) Build/Test')
22-
booleanParam(name: 'windows2022containerd', defaultValue: true, description: 'Windows 2022 (SAC) with containerd Build/Test')
21+
booleanParam(name: 'windows2022', defaultValue: true, description: 'Windows 2022 (LTSC) Build/Test')
22+
booleanParam(name: 'windows2022containerd', defaultValue: true, description: 'Windows 2022 (LTSC) with containerd Build/Test')
2323
booleanParam(name: 'dco', defaultValue: true, description: 'Run the DCO check')
2424
}
2525
environment {
@@ -1204,10 +1204,9 @@ pipeline {
12041204
SOURCES_SUBDIR = 'gopath'
12051205
TESTRUN_DRIVE = 'd'
12061206
TESTRUN_SUBDIR = "CI"
1207-
// TODO switch to mcr.microsoft.com/windows/servercore:2022 once published
1208-
WINDOWS_BASE_IMAGE = 'mcr.microsoft.com/windows/servercore/insider'
1209-
// Available tags can be found at https://mcr.microsoft.com/v2/windows/servercore/insider/tags/list
1210-
WINDOWS_BASE_IMAGE_TAG = '10.0.20348.1'
1207+
WINDOWS_BASE_IMAGE = 'mcr.microsoft.com/windows/servercore'
1208+
// Available tags can be found at https://mcr.microsoft.com/v2/windows/servercore/tags/list
1209+
WINDOWS_BASE_IMAGE_TAG = 'ltsc2022'
12111210
}
12121211
agent {
12131212
node {
@@ -1268,10 +1267,9 @@ pipeline {
12681267
SOURCES_SUBDIR = 'gopath'
12691268
TESTRUN_DRIVE = 'd'
12701269
TESTRUN_SUBDIR = "CI"
1271-
// TODO switch to mcr.microsoft.com/windows/servercore:2022 once published
1272-
WINDOWS_BASE_IMAGE = 'mcr.microsoft.com/windows/servercore/insider'
1273-
// Available tags can be found at https://mcr.microsoft.com/v2/windows/servercore/insider/tags/list
1274-
WINDOWS_BASE_IMAGE_TAG = '10.0.20348.1'
1270+
WINDOWS_BASE_IMAGE = 'mcr.microsoft.com/windows/servercore'
1271+
// Available tags can be found at https://mcr.microsoft.com/v2/windows/servercore/tags/list
1272+
WINDOWS_BASE_IMAGE_TAG = 'ltsc2022'
12751273
DOCKER_WINDOWS_CONTAINERD_RUNTIME = '1'
12761274
}
12771275
agent {

0 commit comments

Comments
 (0)