Merge pull request #6075 from dmcgowan/1.4-update-test-images

estesp · web-flow · commit 8a3cfaf33ecb · 2021-09-30T15:45:03.000-07:00
[release/1.4] Update test images to use Github package registry
diff --git a/client_test.go b/client_test.go
@@ -309,7 +309,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, "ghcr.io/containerd/busybox:latest")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/client_unix_test.go b/client_unix_test.go
@@ -40,17 +40,17 @@ var (
 func init() {
 	switch runtime.GOARCH {
 	case "386":
-		testImage = "docker.io/i386/alpine:latest"
+		testImage = "ghcr.io/containerd/alpine:latest-i386"
 	case "arm":
-		testImage = "docker.io/arm32v6/alpine:latest"
+		testImage = "ghcr.io/containerd/alpine:latest-arm32v6"
 	case "arm64":
-		testImage = "docker.io/arm64v8/alpine:latest"
+		testImage = "ghcr.io/containerd/alpine:latest-arm64v8"
 	case "ppc64le":
-		testImage = "docker.io/ppc64le/alpine:latest"
+		testImage = "ghcr.io/containerd/alpine:latest-ppc64le"
 	case "s390x":
-		testImage = "docker.io/s390x/alpine:latest"
+		testImage = "ghcr.io/containerd/alpine:latest-s390x"
 	default:
-		testImage = "docker.io/library/alpine:latest"
+		testImage = "ghcr.io/containerd/alpine:latest"
 	}
 }
 
diff --git a/image_test.go b/image_test.go
@@ -34,7 +34,7 @@ func TestImageIsUnpacked(t *testing.T) {
 		t.Skip()
 	}
 
-	const imageName = "docker.io/library/busybox:latest"
+	const imageName = "ghcr.io/containerd/busybox:latest"
 	ctx, cancel := testContext(t)
 	defer cancel()
 
@@ -140,7 +140,7 @@ func TestImageUsage(t *testing.T) {
 		t.Skip()
 	}
 
-	imageName := "docker.io/library/busybox:latest"
+	imageName := "ghcr.io/containerd/busybox:latest"
 	ctx, cancel := testContext(t)
 	defer cancel()
 
diff --git a/lease_test.go b/lease_test.go
@@ -54,7 +54,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 := "ghcr.io/containerd/busybox:1.28"
 
 	image, err := client.Pull(ctx, imageName, WithPullUnpack, WithPullSnapshotter("native"))
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ func TestImagePullAllPlatforms(t *testing.T) {`
`309`	`309`	`defer cancel()`
`310`	`310`
`311`	`311`	`cs := client.ContentStore()`
`312`		`- img, err := client.Fetch(ctx, "docker.io/library/busybox:latest")`
	`312`	`+ img, err := client.Fetch(ctx, "ghcr.io/containerd/busybox:latest")`
`313`	`313`	`if err != nil {`
`314`	`314`	`t.Fatal(err)`
`315`	`315`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func TestImageIsUnpacked(t *testing.T) {`
`34`	`34`	`t.Skip()`
`35`	`35`	`}`
`36`	`36`
`37`		`- const imageName = "docker.io/library/busybox:latest"`
	`37`	`+ const imageName = "ghcr.io/containerd/busybox:latest"`
`38`	`38`	`ctx, cancel := testContext(t)`
`39`	`39`	`defer cancel()`
`40`	`40`
`@@ -140,7 +140,7 @@ func TestImageUsage(t *testing.T) {`
`140`	`140`	`t.Skip()`
`141`	`141`	`}`
`142`	`142`
`143`		`- imageName := "docker.io/library/busybox:latest"`
	`143`	`+ imageName := "ghcr.io/containerd/busybox:latest"`
`144`	`144`	`ctx, cancel := testContext(t)`
`145`	`145`	`defer cancel()`
`146`	`146`