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

Update Pause image in tests & config

Browse Source 
With the introduction of Windows Server 2022, some images have been updated
to support WS2022 in their manifest list. This commit updates the test images
accordingly.

Signed-off-by: Adelina Tuvenie <atuvenie@cloudbasesolutions.com>
This commit is contained in:
Adelina Tuvenie
2021-08-31 13:45:38 +03:00
parent 44d5a7e26d
commit 6d3d34b85d
11 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
integration/client/client_test.go
View File

@@ -330,7 +330,7 @@ func TestImagePullAllPlatforms(t *testing.T) {
defer cancel()
cs := client.ContentStore()
img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.5")
img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.6")
if err != nil {
t.Fatal(err)
}
@@ -380,7 +380,7 @@ func TestImagePullSomePlatforms(t *testing.T) {
// Note: Must be different to the image used in TestImagePullAllPlatforms
// or it will see the content pulled by that, and fail.
img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.2", opts...)
img, err := client.Fetch(ctx, "k8s.gcr.io/e2e-test-images/busybox:1.29-2", opts...)
if err != nil {
t.Fatal(err)
}

4
integration/client/image_test.go
View File

@@ -31,7 +31,7 @@ import (
)
func TestImageIsUnpacked(t *testing.T) {
const imageName = "k8s.gcr.io/pause:3.5"
const imageName = "k8s.gcr.io/pause:3.6"
ctx, cancel := testContext(t)
defer cancel()
@@ -137,7 +137,7 @@ func TestImageUsage(t *testing.T) {
t.Skip()
}
imageName := "k8s.gcr.io/pause:3.5"
imageName := "k8s.gcr.io/pause:3.6"
ctx, cancel := testContext(t)
defer cancel()

2
integration/client/lease_test.go
View File

@@ -55,7 +55,7 @@ func TestLeaseResources(t *testing.T) {
defer ls.Delete(ctx, l, leases.SynchronousDelete)
// step 1: download image
imageName := "k8s.gcr.io/pause:3.5"
imageName := "k8s.gcr.io/pause:3.6"
image, err := client.Pull(ctx, imageName, WithPullUnpack, WithPullSnapshotter("native"))
if err != nil {

2
integration/common.go
View File

@@ -49,7 +49,7 @@ func initImages(imageListFile string) {
imageList = ImageList{
Alpine: "docker.io/library/alpine:latest",
BusyBox: "docker.io/library/busybox:latest",
Pause: "k8s.gcr.io/pause:3.5",
Pause: "k8s.gcr.io/pause:3.6",
ResourceConsumer: "k8s.gcr.io/e2e-test-images/resource-consumer:1.9",
VolumeCopyUp: "gcr.io/k8s-cri-containerd/volume-copy-up:2.0",
VolumeOwnership: "gcr.io/k8s-cri-containerd/volume-ownership:2.0",

2
integration/image_list.sample.toml
View File

@@ -1,5 +1,5 @@
alpine = "docker.io/library/alpine:latest"
busybox = "docker.io/library/busybox:latest"
pause = "k8s.gcr.io/pause:3.5"
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"