Use specific image for user namespaces tests

estesp · estesp · commit 33776ada047c · 2021-03-19T22:51:32.000-04:00
Due to the lack of an existing /proc dir in the rootfs of busybox, there
seems to be a race between the mount of /proc and whether the root dir
is already readonly? May need investigation, but for now use an image
that has a /proc dir existing.

Signed-off-by: Phil Estes &lt;estesp@amazon.com&gt;
diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go
@@ -55,6 +55,8 @@ import (
 	"golang.org/x/sys/unix"
 )
 
+const testUserNSImage = "mirror.gcr.io/library/alpine:latest"
+
 // TestRegressionIssue4769 verifies the number of task exit events.
 //
 // Issue: https://github.com/containerd/containerd/issues/4769.
@@ -1596,7 +1598,7 @@ func testUserNamespaces(t *testing.T, readonlyRootFS bool) {
 	)
 	defer cancel()
 
-	image, err = client.GetImage(ctx, testImage)
+	image, err = client.Pull(ctx, testUserNSImage, WithPullUnpack)
 	if err != nil {
 		t.Fatal(err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,8 @@ import (`
`55`	`55`	`"golang.org/x/sys/unix"`
`56`	`56`	`)`
`57`	`57`
	`58`	`+const testUserNSImage = "mirror.gcr.io/library/alpine:latest"`
	`59`	`+`
`58`	`60`	`// TestRegressionIssue4769 verifies the number of task exit events.`
`59`	`61`	`//`
`60`	`62`	`// Issue: https://github.com/containerd/containerd/issues/4769.`
`@@ -1596,7 +1598,7 @@ func testUserNamespaces(t *testing.T, readonlyRootFS bool) {`
`1596`	`1598`	`)`
`1597`	`1599`	`defer cancel()`
`1598`	`1600`
`1599`		`- image, err = client.GetImage(ctx, testImage)`
	`1601`	`+ image, err = client.Pull(ctx, testUserNSImage, WithPullUnpack)`
`1600`	`1602`	`if err != nil {`
`1601`	`1603`	`t.Fatal(err)`
`1602`	`1604`	`}`