Use k8s.gcr.io/pause:3.4.1 in pull-only tests

TBBle · TBBle · commit b375f90128e4 · 2021-03-13T13:08:12.000+11:00
This reduces the need to pull random images from docker.io, and should
greatly reduce the tendancy to hit their hourly rate-limit during
integration test runs.

TestImagePullSomePlatforms uses k8s.gcr.io/pause:3.2 so that it does not
see the content pulled by TestImagePullAllPlatforms. This image is
multi-arch, but not multi-os.

Signed-off-by: Paul "TBBle" Hampson &lt;Paul.Hampson@Pobox.com&gt;
diff --git a/integration/client/client_test.go b/integration/client/client_test.go
@@ -310,7 +310,7 @@ func TestImagePullAllPlatforms(t *testing.T) {
 	defer cancel()
 
 	cs := client.ContentStore()
-	img, err := client.Fetch(ctx, "docker.io/library/busybox:latest")
+	img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.4.1")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -358,7 +358,9 @@ func TestImagePullSomePlatforms(t *testing.T) {
 		opts = append(opts, WithPlatform(platform))
 	}
 
-	img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.4.1", opts...)
+	// Note: Must be different to the image used in TestImagePullAllPlatforms
+	// or it will see the content pulled by that, and fail.
+	img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.2", opts...)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/integration/client/image_test.go b/integration/client/image_test.go
@@ -35,7 +35,7 @@ func TestImageIsUnpacked(t *testing.T) {
 		t.Skip()
 	}
 
-	const imageName = "docker.io/library/busybox:latest"
+	const imageName = "k8s.gcr.io/pause:3.4.1"
 	ctx, cancel := testContext(t)
 	defer cancel()
 
@@ -86,9 +86,9 @@ func TestImagePullWithDistSourceLabel(t *testing.T) {
 		t.Skip()
 	}
 	var (
-		source   = "docker.io"
-		repoName = "library/busybox"
-		tag      = "latest"
+		source   = "k8s.gcr.io"
+		repoName = "pause"
+		tag      = "3.4.1"
 	)
 
 	ctx, cancel := testContext(t)
@@ -144,7 +144,7 @@ func TestImageUsage(t *testing.T) {
 		t.Skip()
 	}
 
-	imageName := "docker.io/library/busybox:latest"
+	imageName := "k8s.gcr.io/pause:3.4.1"
 	ctx, cancel := testContext(t)
 	defer cancel()
 
@@ -241,7 +241,7 @@ func TestImageUsage(t *testing.T) {
 func TestImageSupportedBySnapshotter_Error(t *testing.T) {
 	var unsupportedImage string
 	if runtime.GOOS == "windows" {
-		unsupportedImage = "docker.io/library/busybox:latest"
+		unsupportedImage = "k8s.gcr.io/pause-amd64:3.2"
 	} else {
 		unsupportedImage = "mcr.microsoft.com/windows/nanoserver:1809"
 	}
diff --git a/integration/client/lease_test.go b/integration/client/lease_test.go
@@ -55,7 +55,7 @@ func TestLeaseResources(t *testing.T) {
 	defer ls.Delete(ctx, l, leases.SynchronousDelete)
 
 	// step 1: download image
-	imageName := "docker.io/library/busybox:1.25"
+	imageName := "k8s.gcr.io/pause:3.4.1"
 
 	image, err := client.Pull(ctx, imageName, WithPullUnpack, WithPullSnapshotter("native"))
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ func TestImagePullAllPlatforms(t *testing.T) {`
`310`	`310`	`defer cancel()`
`311`	`311`
`312`	`312`	`cs := client.ContentStore()`
`313`		`- img, err := client.Fetch(ctx, "docker.io/library/busybox:latest")`
	`313`	`+ img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.4.1")`
`314`	`314`	`if err != nil {`
`315`	`315`	`t.Fatal(err)`
`316`	`316`	`}`
`@@ -358,7 +358,9 @@ func TestImagePullSomePlatforms(t *testing.T) {`
`358`	`358`	`opts = append(opts, WithPlatform(platform))`
`359`	`359`	`}`
`360`	`360`
`361`		`- img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.4.1", opts...)`
	`361`	`+ // Note: Must be different to the image used in TestImagePullAllPlatforms`
	`362`	`+ // or it will see the content pulled by that, and fail.`
	`363`	`+ img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.2", opts...)`
`362`	`364`	`if err != nil {`
`363`	`365`	`t.Fatal(err)`
`364`	`366`	`}`