github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #6458 from dcantah/change-to-constant-win2022

Browse Source 
Integration: Change to Windows Server 2022 build number constant
This commit is contained in:
Michael Crosby 2022-01-19 16:19:00 -05:00 committed by GitHub
commit f2c2d07683
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
integration/client/client_windows_test.go
View File

@ -57,18 +57,14 @@ func init() {
testImage = "mcr.microsoft.com/windows/nanoserver:2004" testImage = "mcr.microsoft.com/windows/nanoserver:2004"
case osversion.V20H2: case osversion.V20H2:
testImage = "mcr.microsoft.com/windows/nanoserver:20H2" testImage = "mcr.microsoft.com/windows/nanoserver:20H2"
case 20348: case osversion.V21H2Server:
// 20348 is Windows server 2022's build number.
//
// TODO(dcantah): Use the hardcoded number until there's an hcsshim release with this build
// number included.
testImage = "mcr.microsoft.com/windows/nanoserver:ltsc2022" testImage = "mcr.microsoft.com/windows/nanoserver:ltsc2022"
default: default:
// Due to some efforts in improving down-level compatibility for Windows containers (see // Due to some efforts in improving down-level compatibility for Windows containers (see
// https://techcommunity.microsoft.com/t5/containers/windows-server-2022-and-beyond-for-containers/ba-p/2712487) // https://techcommunity.microsoft.com/t5/containers/windows-server-2022-and-beyond-for-containers/ba-p/2712487)
// the ltsc2022 image should continue to work on builds ws2022 and onwards (Winodws 11 for example). With this in mind, // the ltsc2022 image should continue to work on builds ws2022 and onwards (Windows 11 for example). With this in mind,
// if there's no mapping for the host build just use the Windows Server 2022 image. // if there's no mapping for the host build just use the Windows Server 2022 image.
if b > 20348 { if b > osversion.V21H2Server {
testImage = "mcr.microsoft.com/windows/nanoserver:ltsc2022" testImage = "mcr.microsoft.com/windows/nanoserver:ltsc2022"
return return
} }