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

Use k8s.gcr.io/pause:3.4.1 in pull-only tests

Browse Source 
This reduces the need to pull random images from docker.io, and should
greatly reduce the tendancy to hit their hourly rate-limit during
integration test runs.

TestImagePullSomePlatforms uses k8s.gcr.io/pause:3.2 so that it does not
see the content pulled by TestImagePullAllPlatforms. This image is
multi-arch, but not multi-os.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
This commit is contained in:
Paul "TBBle" Hampson 2021-03-13 12:14:24 +11:00
parent bcc02002a2
commit b375f90128
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
integration/client/client_test.go
View File

@ -310,7 +310,7 @@ func TestImagePullAllPlatforms(t *testing.T) {
defer cancel() defer cancel()
cs := client.ContentStore() cs := client.ContentStore()
img, err := client.Fetch(ctx, "docker.io/library/busybox:latest") img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.4.1")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -358,7 +358,9 @@ func TestImagePullSomePlatforms(t *testing.T) {
opts = append(opts, WithPlatform(platform)) opts = append(opts, WithPlatform(platform))
} }
img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.4.1", opts...) // 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...)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

12
integration/client/image_test.go
View File

@ -35,7 +35,7 @@ func TestImageIsUnpacked(t *testing.T) {
t.Skip() t.Skip()
} }
const imageName = "docker.io/library/busybox:latest" const imageName = "k8s.gcr.io/pause:3.4.1"
ctx, cancel := testContext(t) ctx, cancel := testContext(t)
defer cancel() defer cancel()
@ -86,9 +86,9 @@ func TestImagePullWithDistSourceLabel(t *testing.T) {
t.Skip() t.Skip()
} }
var ( var (
source = "docker.io" source = "k8s.gcr.io"
repoName = "library/busybox" repoName = "pause"
tag = "latest" tag = "3.4.1"
) )
ctx, cancel := testContext(t) ctx, cancel := testContext(t)
@ -144,7 +144,7 @@ func TestImageUsage(t *testing.T) {
t.Skip() t.Skip()
} }
imageName := "docker.io/library/busybox:latest" imageName := "k8s.gcr.io/pause:3.4.1"
ctx, cancel := testContext(t) ctx, cancel := testContext(t)
defer cancel() defer cancel()
@ -241,7 +241,7 @@ func TestImageUsage(t *testing.T) {
func TestImageSupportedBySnapshotter_Error(t *testing.T) { func TestImageSupportedBySnapshotter_Error(t *testing.T) {
var unsupportedImage string var unsupportedImage string
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
unsupportedImage = "docker.io/library/busybox:latest" unsupportedImage = "k8s.gcr.io/pause-amd64:3.2"
} else { } else {
unsupportedImage = "mcr.microsoft.com/windows/nanoserver:1809" unsupportedImage = "mcr.microsoft.com/windows/nanoserver:1809"
} }

2
integration/client/lease_test.go
View File

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