From 7183fc81d2fd1b21d7a4dbde3e64e50208feb458 Mon Sep 17 00:00:00 2001 From: Kazuyoshi Kato Date: Fri, 29 Apr 2022 22:07:10 +0000 Subject: [PATCH 1/2] Skip TestImagePullWithConcurrencyLimit on Cirrus CI This test tends to fail under Cirrus CI + Vagrant. Skipping for now since running the test on GitHub Actions would be suffice. Signed-off-by: Kazuyoshi Kato --- integration/client/client_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/integration/client/client_test.go b/integration/client/client_test.go index bfb026b79..15ebbbdc0 100644 --- a/integration/client/client_test.go +++ b/integration/client/client_test.go @@ -449,6 +449,13 @@ func TestImagePullSchema1(t *testing.T) { } func TestImagePullWithConcurrencyLimit(t *testing.T) { + if os.Getenv("CIRRUS_CI") != "" { + // This test tends to fail under Cirrus CI + Vagrant due to "connection reset by peer" from + // pkg-containers.githubusercontent.com. + // Does GitHub throttle requests from Cirrus CI more compared to GitHub Actions? + t.Skip("unstable under Cirrus CI") + } + client, err := newClient(t, address) if err != nil { t.Fatal(err) From 8160a3efc3d75bb927f4be8b19f640690369987b Mon Sep 17 00:00:00 2001 From: Kazuyoshi Kato Date: Fri, 29 Apr 2022 22:50:20 +0000 Subject: [PATCH 2/2] Reduce the number of the concurrent HTTP requests in TestUserNamespaces Signed-off-by: Kazuyoshi Kato --- integration/client/container_linux_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index ac6d2ea34..9fd76e0b8 100644 --- a/integration/client/container_linux_test.go +++ b/integration/client/container_linux_test.go @@ -1117,7 +1117,6 @@ func TestContainerKillInitPidHost(t *testing.T) { } func TestUserNamespaces(t *testing.T) { - t.Parallel() t.Run("WritableRootFS", func(t *testing.T) { testUserNamespaces(t, false) }) // see #1373 and runc#1572 t.Run("ReadonlyRootFS", func(t *testing.T) { testUserNamespaces(t, true) })