Merge pull request #6041 from dmcgowan/backport-1.5-use-ghcr-test-images

AkihiroSuda · web-flow · commit 4de759ab5952 · 2021-09-23T13:26:16.000+09:00
[release/1.5] Use github images for integration tests
diff --git a/integration/client/client_unix_test.go b/integration/client/client_unix_test.go
@@ -32,7 +32,7 @@ const (
 )
 
 var (
-	testImage    = "mirror.gcr.io/library/busybox:1.32.0"
+	testImage    = "ghcr.io/containerd/busybox:1.32"
 	shortCommand = withProcessArgs("true")
 	longCommand  = withProcessArgs("/bin/sh", "-c", "while true; do sleep 1; done")
 )
diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go
@@ -55,7 +55,7 @@ import (
 	"golang.org/x/sys/unix"
 )
 
-const testUserNSImage = "mirror.gcr.io/library/alpine:3.13.5"
+const testUserNSImage = "ghcr.io/containerd/alpine:3.14.0"
 
 // TestRegressionIssue4769 verifies the number of task exit events.
 //

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ const (`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`var (`
`35`		`- testImage = "mirror.gcr.io/library/busybox:1.32.0"`
	`35`	`+ testImage = "ghcr.io/containerd/busybox:1.32"`
`36`	`36`	`shortCommand = withProcessArgs("true")`
`37`	`37`	`longCommand = withProcessArgs("/bin/sh", "-c", "while true; do sleep 1; done")`
`38`	`38`	`)`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ import (`
`55`	`55`	`"golang.org/x/sys/unix"`
`56`	`56`	`)`
`57`	`57`
`58`		`-const testUserNSImage = "mirror.gcr.io/library/alpine:3.13.5"`
	`58`	`+const testUserNSImage = "ghcr.io/containerd/alpine:3.14.0"`
`59`	`59`
`60`	`60`	`// TestRegressionIssue4769 verifies the number of task exit events.`
`61`	`61`	`//`