Skip to content

wcow: enable integration tests on WS2025 #5964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/test-os.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ jobs:
needs:
- build
env:
TESTFLAGS: "-v --timeout=60m"
TESTFLAGS: "-v --timeout=120m"
GOTESTSUM_FORMAT: "standard-verbose"
strategy:
fail-fast: false
matrix:
os: [windows-2022]
os: [windows-2022, windows-2025]
worker:
- containerd
pkg:
Expand Down Expand Up @@ -112,6 +112,10 @@ jobs:
worker: containerd
pkg: ./...
skip-integration-tests: 1
- os: windows-2025
worker: containerd
pkg: ./...
skip-integration-tests: 1
steps:
-
name: Prepare
Expand Down
4 changes: 3 additions & 1 deletion client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11561,6 +11561,8 @@ func testSourcePolicy(t *testing.T, sb integration.Sandbox) {
}

func testLLBMountPerformance(t *testing.T, sb integration.Sandbox) {
// TODO: flaky on WS2025
integration.SkipOnPlatform(t, "windows")
c, err := New(sb.Context(), sb.Address())
require.NoError(t, err)
defer c.Close()
Expand Down Expand Up @@ -11589,7 +11591,7 @@ func testLLBMountPerformance(t *testing.T, sb integration.Sandbox) {
require.NoError(t, err)

// Windows images take longer time
timeout := integration.UnixOrWindows(time.Minute, 3*time.Minute)
timeout := integration.UnixOrWindows(time.Minute, 6*time.Minute)
timeoutCtx, cancel := context.WithTimeoutCause(sb.Context(), timeout, nil)
defer cancel()
_, err = c.Solve(timeoutCtx, def, SolveOpt{}, nil)
Expand Down
2 changes: 2 additions & 0 deletions frontend/dockerfile/dockerfile_mount_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,8 @@ COPY --from=base /combined.txt /

// moby/buildkit#5566
func testCacheMountParallel(t *testing.T, sb integration.Sandbox) {
// TODO: flaky on WS2025
integration.SkipOnPlatform(t, "windows")
f := getFrontend(t, sb)

dockerfile := []byte(integration.UnixOrWindows(
Expand Down
Loading