Skip to content

Commit

Permalink
integration: align tags of test images
Browse files Browse the repository at this point in the history
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 <github@gone.nl>
  • Loading branch information
thaJeztah committed Dec 3, 2021
1 parent 106086d commit f33d38c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion integration/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
Expand Down
4 changes: 2 additions & 2 deletions integration/image_list.sample.toml
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions integration/volume_copy_up_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion test/build-test-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f33d38c

Please sign in to comment.