Enable CIs to run on WS2022 and WS2025

kiashok · austinvazquez · commit d430f3277ea9 · 2025-06-19T15:28:40.000-07:00
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com> (cherry picked from commit 2f1948a) Signed-off-by: Austin Vazquez <austin.vazquez.dev@gmail.com>
diff --git a/.github/workflows/build-test-images.yml b/.github/workflows/build-test-images.yml
@@ -9,7 +9,7 @@ on:
       azure_windows_image_id:
         description: Windows image URN to deploy
         required: true
-        default: MicrosoftWindowsServer:WindowsServer:2022-datacenter:20348.350.2111030009
+        default: MicrosoftWindowsServer:WindowsServer:2025-datacenter:latest
       azure_vm_size:
         description: Windows image builder VM size
         required: true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-24.04, ubuntu-24.04-arm, macos-13, windows-2019]
+        os: [ubuntu-24.04, ubuntu-24.04-arm, macos-13, windows-2025]
 
     steps:
       - name: Install dependencies
@@ -217,7 +217,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-24.04, ubuntu-24.04-arm, macos-13, windows-2019, windows-2022]
+        os: [ubuntu-24.04, ubuntu-24.04-arm, macos-13, windows-2022, windows-2025]
         go-version: ["1.23.7", "1.24.1"]
     steps:
       - name: Install dependencies
@@ -260,7 +260,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2019, windows-2022]
+        os: [windows-2022, windows-2025]
 
     defaults:
       run:
@@ -287,17 +287,6 @@ jobs:
 
       - run: script/setup/install-dev-tools
 
-      # needs to be a separate step since terminal reload is required to bring in new env variables and PATH
-      - name: Upgrade Chocolaty on Windows 2019
-        if: matrix.os == 'windows-2019'
-        shell: powershell
-        run: .\script\setup\upgrade_chocolaty_windows_2019.ps1
-
-      - name: Upgrade MinGW on Windows 2019
-        if: matrix.os == 'windows-2019'
-        shell: powershell
-        run: .\script\setup\upgrade_mingw_windows_2019.ps1
-
       - name: Binaries
         env:
           CGO_ENABLED: 1
diff --git a/.github/workflows/windows-periodic.yml b/.github/workflows/windows-periodic.yml
@@ -38,16 +38,16 @@ jobs:
       id-token: 'write'
     strategy:
       matrix:
-        win_ver: [ltsc2019, ltsc2022]
+        win_ver: [ltsc2022, ltsc2025]
         include:
-        - win_ver: ltsc2019
-          AZURE_IMG: "MicrosoftWindowsServer:WindowsServer:2019-Datacenter-with-Containers-smalldisk:17763.1935.2105080716"
-          AZURE_RESOURCE_GROUP: ctrd-integration-ltsc2019-${{ github.run_id }}
-          GOOGLE_BUCKET: "containerd-integration/logs/windows-ltsc2019/"
         - win_ver: ltsc2022
           AZURE_IMG: "MicrosoftWindowsServer:WindowsServer:2022-datacenter-smalldisk-g2:20348.169.2108120020"
           AZURE_RESOURCE_GROUP: ctrd-integration-ltsc2022-${{ github.run_id }}
           GOOGLE_BUCKET: "containerd-integration/logs/windows-ltsc2022/"
+        - win_ver: ltsc2025
+          AZURE_IMG: "MicrosoftWindowsServer:WindowsServer:2025-Datacenter:latest"
+          AZURE_RESOURCE_GROUP: ctrd-integration-ltsc2025-${{ github.run_id }}
+          GOOGLE_BUCKET: "containerd-integration/logs/windows-ltsc2025/"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/integration/image_load_test.go b/integration/image_load_test.go
@@ -18,16 +18,26 @@ package integration
 
 import (
 	"path/filepath"
+	goruntime "runtime"
 	"testing"
 	"time"
 
+	"github.com/containerd/containerd/integration/platform"
 	"github.com/stretchr/testify/require"
 	exec "golang.org/x/sys/execabs"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 // Test to load an image from tarball.
 func TestImageLoad(t *testing.T) {
+	// TODO(kiashok): Docker is not able to pull the right
+	// image manifest of `testImage` on WS2025 host. Temporarily
+	// skipping this test for WS2025 while its fixed on docker.
+	// This test is validated on WS2022 anyway.
+	if goruntime.GOOS == "windows" && platform.SkipTestOnHost() {
+		t.Skip("Temporarily skip validating on WS2025")
+	}
+
 	testImage := GetImage(BusyBox)
 	loadedImage := testImage
 	_, err := exec.LookPath("docker")
diff --git a/integration/images/volume-copy-up/Makefile b/integration/images/volume-copy-up/Makefile
@@ -33,8 +33,8 @@ endif
 OS ?= linux
 # Architectures supported: amd64, arm64
 ARCH ?= amd64
-# OS Version for the Windows images: 1809, 20H2, ltsc2022
-OSVERSION ?= 1809
+# OS Version for the Windows images: ltsc2022, ltsc2025
+OSVERSION ?= ltsc2022
 
 # The output type could either be docker (local), or registry.
 # If it is registry, it will also allow us to push the Windows images.
@@ -46,7 +46,7 @@ ALL_OS_ARCH.linux = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch))
 
 ifneq ($(REMOTE_DOCKER_URL),)
 ALL_OS += windows
-ALL_OSVERSIONS.windows := 1809 20H2 ltsc2022
+ALL_OSVERSIONS.windows := ltsc2022 ltsc2025
 ALL_OS_ARCH.windows = $(foreach osversion, ${ALL_OSVERSIONS.windows}, windows-amd64-${osversion})
 BASE.windows := mcr.microsoft.com/windows/nanoserver
 endif
diff --git a/integration/images/volume-ownership/Makefile b/integration/images/volume-ownership/Makefile
@@ -33,8 +33,8 @@ endif
 OS ?= linux
 # Architectures supported: amd64, arm64
 ARCH ?= amd64
-# OS Version for the Windows images: 1809, 20H2, ltsc2022
-OSVERSION ?= 1809
+# OS Version for the Windows images: ltsc2022, lts2025
+OSVERSION ?= ltsc2022
 
 # The output type could either be docker (local), or registry.
 # If it is registry, it will also allow us to push the Windows images.
@@ -46,7 +46,7 @@ ALL_OS_ARCH.linux = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch))
 
 ifneq ($(REMOTE_DOCKER_URL),)
 ALL_OS += windows
-ALL_OSVERSIONS.windows := 1809 20H2 ltsc2022
+ALL_OSVERSIONS.windows := ltsc2022 ltsc2025
 ALL_OS_ARCH.windows = $(foreach osversion, ${ALL_OSVERSIONS.windows}, windows-amd64-${osversion})
 BASE.windows := mcr.microsoft.com/windows/nanoserver
 endif
diff --git a/integration/platform/doc.go b/integration/platform/doc.go
@@ -0,0 +1,19 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+// The platform package contains integration test helpers for
+// platform specific behaviors.
+package platform
diff --git a/integration/platform/helper_unix.go b/integration/platform/helper_unix.go
@@ -0,0 +1,23 @@
+//go:build !windows
+
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package platform
+
+func SkipTestOnHost() bool {
+	return false
+}
diff --git a/integration/platform/helper_windows.go b/integration/platform/helper_windows.go
@@ -0,0 +1,56 @@
+//go:build windows
+
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package platform
+
+import (
+	"sync"
+
+	"github.com/Microsoft/hcsshim/osversion"
+	"golang.org/x/sys/windows"
+)
+
+var (
+	osv  osversion.OSVersion
+	once sync.Once
+)
+
+// Temporarily used on windows to skip failing tests on WS2025.
+func SkipTestOnHost() bool {
+	const (
+		// Copied from https://github.com/microsoft/hcsshim/blob/9b2e94f544990ce7e8f3ccdb60f1a9abd7debe05/osversion/windowsbuilds.go#L88-L90
+		// Windows Server 2025 build 26100
+		// The Windows Server 2025 constant was added in Microsoft/hcsshim@v0.13.0.
+		// Copied here to avoid updating the hcsshim dependency which requires breaking changes in the archive package.
+		V25H1Server = 26100
+		LTSC2025    = V25H1Server
+	)
+
+	// Copied from https://github.com/microsoft/hcsshim/commit/1e6fc28c2f57d666f91269fc82d7b66c7d0d9093 (added in v0.13.0)
+	// Pre Microsoft/hcsshim@v0.13.0, the osversion.Get() function required the calling application to be
+	// manifested to get the correct version information. This is not the case anymore.
+	once.Do(func() {
+		v := windows.RtlGetVersion()
+		osv = osversion.OSVersion{}
+		osv.MajorVersion = uint8(v.MajorVersion)
+		osv.MinorVersion = uint8(v.MinorVersion)
+		osv.Build = uint16(v.BuildNumber)
+	})
+
+	return osv.Build == LTSC2025
+}
diff --git a/snapshots/testsuite/testsuite_unix.go b/snapshots/testsuite/testsuite_unix.go
@@ -27,3 +27,8 @@ func clearMask() func() {
 		syscall.Umask(oldumask)
 	}
 }
+
+// Used only on Windows to skip tests for certain host OS versions.
+func SkipTestOnHost() bool {
+	return false
+}

Original file line number	Diff line number	Diff line change
`@@ -27,3 +27,8 @@ func clearMask() func() {`
`27`	`27`	`syscall.Umask(oldumask)`
`28`	`28`	`}`
`29`	`29`	`}`
	`30`	`+`
	`31`	`+// Used only on Windows to skip tests for certain host OS versions.`
	`32`	`+func SkipTestOnHost() bool {`
	`33`	`+ return false`
	`34`	`+}`