Skip to content

Commit 33d04d7

Browse files
committed
wcow: enable integration tests on WS2025
Re-enabling integration tests on WS2025. WIP: still needs investigation why the tests take longer on WS2025, upto 2x for some. Additionally, these 2 are flaky on WS2025: - [ ] client `testLLBMountPerformance` - [ ] dockerfile `testCacheMountParallel` Signed-off-by: Anthony Nandaa <[email protected]>
1 parent f2f3719 commit 33d04d7

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

.github/workflows/test-os.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ jobs:
7878
needs:
7979
- build
8080
env:
81-
TESTFLAGS: "-v --timeout=60m"
81+
TESTFLAGS: "-v --timeout=120m"
8282
GOTESTSUM_FORMAT: "standard-verbose"
8383
strategy:
8484
fail-fast: false
8585
matrix:
86-
os: [windows-2022]
86+
os: [windows-2022, windows-2025]
8787
worker:
8888
- containerd
8989
pkg:
@@ -112,6 +112,10 @@ jobs:
112112
worker: containerd
113113
pkg: ./...
114114
skip-integration-tests: 1
115+
- os: windows-2025
116+
worker: containerd
117+
pkg: ./...
118+
skip-integration-tests: 1
115119
steps:
116120
-
117121
name: Prepare

client/client_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11395,6 +11395,8 @@ func testSourcePolicy(t *testing.T, sb integration.Sandbox) {
1139511395
}
1139611396

1139711397
func testLLBMountPerformance(t *testing.T, sb integration.Sandbox) {
11398+
// TODO: flaky on WS2025
11399+
integration.SkipOnPlatform(t, "windows")
1139811400
c, err := New(sb.Context(), sb.Address())
1139911401
require.NoError(t, err)
1140011402
defer c.Close()
@@ -11423,7 +11425,7 @@ func testLLBMountPerformance(t *testing.T, sb integration.Sandbox) {
1142311425
require.NoError(t, err)
1142411426

1142511427
// Windows images take longer time
11426-
timeout := integration.UnixOrWindows(time.Minute, 3*time.Minute)
11428+
timeout := integration.UnixOrWindows(time.Minute, 6*time.Minute)
1142711429
timeoutCtx, cancel := context.WithTimeoutCause(sb.Context(), timeout, nil)
1142811430
defer cancel()
1142911431
_, err = c.Solve(timeoutCtx, def, SolveOpt{}, nil)

frontend/dockerfile/dockerfile_mount_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,8 @@ COPY --from=base /combined.txt /
646646

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

651653
dockerfile := []byte(integration.UnixOrWindows(

0 commit comments

Comments
 (0)