github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

integration: align tags of test images

Browse Source 
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>
This commit is contained in:
Sebastiaan van Stijn 2021-12-01 14:53:48 +01:00
parent 106086d65a
commit f33d38c7cb
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration/common.go
View File

@ -50,7 +50,7 @@ func initImages(imageListFile string) {
Alpine: "docker.io/library/alpine:latest", Alpine: "docker.io/library/alpine:latest",
BusyBox: "docker.io/library/busybox:latest", BusyBox: "docker.io/library/busybox:latest",
Pause: "k8s.gcr.io/pause:3.6", 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", VolumeCopyUp: "ghcr.io/containerd/volume-copy-up:2.1",
VolumeOwnership: "ghcr.io/containerd/volume-ownership:2.1", VolumeOwnership: "ghcr.io/containerd/volume-ownership:2.1",
} }

4
integration/image_list.sample.toml
View File

@ -1,5 +1,5 @@
alpine = "docker.io/library/alpine:latest" alpine = "docker.io/library/alpine:latest"
busybox = "docker.io/library/busybox:latest" busybox = "docker.io/library/busybox:latest"
pause = "k8s.gcr.io/pause:3.6" pause = "k8s.gcr.io/pause:3.6"
VolumeCopyUp = "gcr.io/k8s-cri-containerd/volume-copy-up:2.0" VolumeCopyUp = "ghcr.io/containerd/volume-copy-up:2.1"
VolumeOwnership = "gcr.io/k8s-cri-containerd/volume-ownership:2.0" VolumeOwnership = "ghcr.io/containerd/volume-ownership:2.1"

4
integration/volume_copy_up_test.go
View File

@ -50,7 +50,7 @@ func TestVolumeCopyUp(t *testing.T) {
t.Logf("Start the container") t.Logf("Start the container")
require.NoError(t, runtimeService.StartContainer(cn)) 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". // volume, which contains a test_file with content "test_content".
t.Logf("Check whether volume contains the test file") t.Logf("Check whether volume contains the test file")
stdout, stderr, err := runtimeService.ExecSync(cn, []string{ stdout, stderr, err := runtimeService.ExecSync(cn, []string{
@ -109,7 +109,7 @@ func TestVolumeOwnership(t *testing.T) {
t.Logf("Start the container") t.Logf("Start the container")
require.NoError(t, runtimeService.StartContainer(cn)) 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. // volume, which is owned by nobody:nogroup.
t.Logf("Check ownership of test directory inside container") t.Logf("Check ownership of test directory inside container")
stdout, stderr, err := runtimeService.ExecSync(cn, []string{ stdout, stderr, err := runtimeService.ExecSync(cn, []string{

2
test/build-test-images.sh
View File

@ -15,7 +15,7 @@
# limitations under the License. # limitations under the License.
# This script is used to build and upload images in integration/images # 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 xtrace
set -o errexit set -o errexit