From f33d38c7cbc63e092368d69f1470e11906266f67 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 1 Dec 2021 14:53:48 +0100 Subject: [PATCH] integration: align tags of test images I noticed we were using some different versions of the same test images, so changing them to be the same (can help with find/replace if we need to update them). Signed-off-by: Sebastiaan van Stijn --- integration/common.go | 2 +- integration/image_list.sample.toml | 4 ++-- integration/volume_copy_up_test.go | 4 ++-- test/build-test-images.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integration/common.go b/integration/common.go index 1e01a0c75..7ffdb681d 100644 --- a/integration/common.go +++ b/integration/common.go @@ -50,7 +50,7 @@ func initImages(imageListFile string) { Alpine: "docker.io/library/alpine:latest", BusyBox: "docker.io/library/busybox:latest", Pause: "k8s.gcr.io/pause:3.6", - ResourceConsumer: "k8s.gcr.io/e2e-test-images/resource-consumer:1.9", + ResourceConsumer: "k8s.gcr.io/e2e-test-images/resource-consumer:1.10", VolumeCopyUp: "ghcr.io/containerd/volume-copy-up:2.1", VolumeOwnership: "ghcr.io/containerd/volume-ownership:2.1", } diff --git a/integration/image_list.sample.toml b/integration/image_list.sample.toml index 7a638efc2..4a70c5d14 100644 --- a/integration/image_list.sample.toml +++ b/integration/image_list.sample.toml @@ -1,5 +1,5 @@ alpine = "docker.io/library/alpine:latest" busybox = "docker.io/library/busybox:latest" pause = "k8s.gcr.io/pause:3.6" -VolumeCopyUp = "gcr.io/k8s-cri-containerd/volume-copy-up:2.0" -VolumeOwnership = "gcr.io/k8s-cri-containerd/volume-ownership:2.0" +VolumeCopyUp = "ghcr.io/containerd/volume-copy-up:2.1" +VolumeOwnership = "ghcr.io/containerd/volume-ownership:2.1" diff --git a/integration/volume_copy_up_test.go b/integration/volume_copy_up_test.go index 7fcd6ad3f..b04a9be37 100644 --- a/integration/volume_copy_up_test.go +++ b/integration/volume_copy_up_test.go @@ -50,7 +50,7 @@ func TestVolumeCopyUp(t *testing.T) { t.Logf("Start the container") require.NoError(t, runtimeService.StartContainer(cn)) - // gcr.io/k8s-cri-containerd/volume-copy-up:2.0 contains a test_dir + // ghcr.io/containerd/volume-copy-up:2.1 contains a test_dir // volume, which contains a test_file with content "test_content". t.Logf("Check whether volume contains the test file") stdout, stderr, err := runtimeService.ExecSync(cn, []string{ @@ -109,7 +109,7 @@ func TestVolumeOwnership(t *testing.T) { t.Logf("Start the container") require.NoError(t, runtimeService.StartContainer(cn)) - // gcr.io/k8s-cri-containerd/volume-ownership:2.0 contains a test_dir + // ghcr.io/containerd/volume-ownership:2.1 contains a test_dir // volume, which is owned by nobody:nogroup. t.Logf("Check ownership of test directory inside container") stdout, stderr, err := runtimeService.ExecSync(cn, []string{ diff --git a/test/build-test-images.sh b/test/build-test-images.sh index 4f810cf12..8594a3c34 100755 --- a/test/build-test-images.sh +++ b/test/build-test-images.sh @@ -15,7 +15,7 @@ # limitations under the License. # This script is used to build and upload images in integration/images -# directory to gcr.io/k8s-cri-containerd repository +# directory to ghcr.io/containerd repository set -o xtrace set -o errexit