Merge pull request #6319 from dmcgowan/update-windows-integration-image-to-ghcr

Move test volume images from gcr to ghcr

integration/client/client_unix_test.go

@@ -34,7 +34,7 @@ const (
 
 var (
 	testImage             = "ghcr.io/containerd/busybox:1.32"
-	testMultiLayeredImage = "gcr.io/k8s-cri-containerd/volume-copy-up:2.1"
+	testMultiLayeredImage = "ghcr.io/containerd/volume-copy-up:2.1"
 	shortCommand          = withProcessArgs("true")
 	longCommand           = withProcessArgs("/bin/sh", "-c", "while true; do sleep 1; done")
 )

integration/client/client_windows_test.go

@@ -33,7 +33,7 @@ var (
 	defaultRoot           = filepath.Join(os.Getenv("programfiles"), "containerd", "root-test")
 	defaultState          = filepath.Join(os.Getenv("programfiles"), "containerd", "state-test")
 	testImage             string
-	testMultiLayeredImage = "gcr.io/k8s-cri-containerd/volume-copy-up:2.1"
+	testMultiLayeredImage = "ghcr.io/containerd/volume-copy-up:2.1"
 	shortCommand          = withTrue()
 	longCommand           = withProcessArgs("ping", "-t", "localhost")
 )

integration/client/import_test.go

@@ -53,13 +53,6 @@ func TestExportAndImport(t *testing.T) {
 // images remain sane, and that the Garbage Collector won't delete part of its
 // content.
 func TestExportAndImportMultiLayer(t *testing.T) {
-	// Skip this test on Windows for now. The image being used for this test was updated recently and the manifest no longer has an entry for
-	// Windows so this will fail.
-	//
-	// TODO(dcantah): Look into what happened to the image and revert this.
-	if runtime.GOOS == "windows" {
-		t.Skip("Skipped on Windows")
-	}
 	testExportImport(t, testMultiLayeredImage)
 }