[release/0.9] Add ws2022 image/build to cri-containerd tests (#1160)#1274
Merged
dcantah merged 2 commits intomicrosoft:release/0.9from Jan 11, 2022
Merged
Conversation
Contributor
Author
|
Oh crud, need the 21h1 osversion definitions too. Fixing and updating the description |
* Add 21H2 definitions to osversion package This change adds three new definitions to the osversion package. All three definitions are all of the 21H2 builds across Windows 10, Windows Server and Windows 11, which all have different build numbers. The approach taken was to add a suffix to the definitions with Win10, Server and Win11 respectively. Signed-off-by: Daniel Canter <dcanter@microsoft.com> (cherry picked from commit 3a8cd1e) Signed-off-by: Daniel Canter <dcanter@microsoft.com>
* Add ws2022 image/build to cri-integration tests This change adds a new case to the getWindowsServerCoreImage and getWindowsNanoserverImage functions to return ws2022 on a ws2022 or higher build. The higher case is because of some recent efforts to improve down-level compatability for Windows container images. For reference, the ltsc2022 image works on a win11 host without hypervisor isolation. Signed-off-by: Daniel Canter <dcanter@microsoft.com> (cherry picked from commit f099e34) Signed-off-by: Daniel Canter <dcanter@microsoft.com>
07ad0e9 to
7577f5b
Compare
katiewasnothere
approved these changes
Jan 11, 2022
anmaxvl
approved these changes
Jan 11, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This change backports the following changes to get ws2022 support for the cri-containerd suite.