github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #6880 from kzys/fix-cirrus-ci

Browse Source 
Make Cirrus CI tests more stable
This commit is contained in:
Derek McGowan 2022-04-29 17:21:23 -07:00 committed by GitHub
commit 91ceda541b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
integration/client/client_test.go
View File

@ -449,6 +449,13 @@ func TestImagePullSchema1(t *testing.T) {
} }
func TestImagePullWithConcurrencyLimit(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) client, err := newClient(t, address)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)

1
integration/client/container_linux_test.go
View File

@ -1117,7 +1117,6 @@ func TestContainerKillInitPidHost(t *testing.T) {
} }
func TestUserNamespaces(t *testing.T) { func TestUserNamespaces(t *testing.T) {
t.Parallel()
t.Run("WritableRootFS", func(t *testing.T) { testUserNamespaces(t, false) }) t.Run("WritableRootFS", func(t *testing.T) { testUserNamespaces(t, false) })
// see #1373 and runc#1572 // see #1373 and runc#1572
t.Run("ReadonlyRootFS", func(t *testing.T) { testUserNamespaces(t, true) }) t.Run("ReadonlyRootFS", func(t *testing.T) { testUserNamespaces(t, true) })