Skip to content

[release/2.0] Enable CIs to run on WS2022 and WS2025#11970

Merged
estesp merged 1 commit intocontainerd:release/2.0from
austinvazquez:cherry-pick-windows-runner-updates-to-2.0
Jun 23, 2025
Merged

[release/2.0] Enable CIs to run on WS2022 and WS2025#11970
estesp merged 1 commit intocontainerd:release/2.0from
austinvazquez:cherry-pick-windows-runner-updates-to-2.0

Conversation

@austinvazquez
Copy link
Member

@austinvazquez austinvazquez commented Jun 10, 2025

This change backports the Windows runner image updates for Windows 2019 deprecation to release/2.0.

(cherry picked from commit 2f1948a)

Note: not a clean cherry-pick; edited to include a copy of Windows 2025 constant copied from Microsoft/hcsshim@v0.13.0

@estesp
Copy link
Member

estesp commented Jun 10, 2025

Looks like you also need hcsshim 0.13 or above for this to work 🤔 The commit that added the current version strings is only in hcsshim 0.13 and above.

@austinvazquez austinvazquez force-pushed the cherry-pick-windows-runner-updates-to-2.0 branch from d738ce0 to 689ade8 Compare June 10, 2025 15:12
@austinvazquez
Copy link
Member Author

Oof that dependency update exploded the delta. Mostly vendored code though, but it looks like there are some build failures which I don't see on Linux. So might need to go through some pull requests and find the missing piece.

@austinvazquez austinvazquez marked this pull request as draft June 10, 2025 15:16
@austinvazquez austinvazquez force-pushed the cherry-pick-windows-runner-updates-to-2.0 branch from 689ade8 to f23e38a Compare June 10, 2025 16:09
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
(cherry picked from commit 2f1948a)
Signed-off-by: Austin Vazquez <austin.vazquez.dev@gmail.com>
@austinvazquez austinvazquez force-pushed the cherry-pick-windows-runner-updates-to-2.0 branch from f23e38a to 9724cd5 Compare June 10, 2025 16:33
@austinvazquez austinvazquez marked this pull request as ready for review June 10, 2025 16:36
@austinvazquez austinvazquez requested a review from kiashok June 10, 2025 16:37
@austinvazquez
Copy link
Member Author

austinvazquez commented Jun 10, 2025

Okay, I might have something that works. I backtracked a bit and dropped pulling in Microsoft/hcsshim@v0.13.0 build dep update. So I found the v0.12.9->v0.13.0-rc3 jump happened in 306c47f. I looked at doing it myself for release/2.0 branch but found it would bring some breaking changes to pkg/archive AsCimContainerLayer function.

cc: @kiashok wdyt, am I way off base here?

@austinvazquez austinvazquez requested a review from estesp June 10, 2025 16:42
// 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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this makes sense to me.. we can see what @kiashok says

@austinvazquez
Copy link
Member Author

@kiashok, curious if you could take a look at this one to unblock a 2.0 release. Slight changes to the fixes you made for mainline and 2.1 branches.

@github-project-automation github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review Jun 21, 2025
Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think to move forward, adding the constant defined in the tests is a reasonable workaround compared to an hcsshim update; let's merge this

@estesp estesp merged commit 2474313 into containerd:release/2.0 Jun 23, 2025
101 of 102 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Jun 23, 2025
@austinvazquez austinvazquez deleted the cherry-pick-windows-runner-updates-to-2.0 branch June 23, 2025 23:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

github_actions Pull requests that update GitHub Actions code platform/windows Windows size/M

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

5 participants