Skip to content

Commit f361a12

Browse files
committed
fix: e2e tests by using hopefully immutable traefik/whoami image in Docker Hub
1 parent ee226d1 commit f361a12

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

test/e2e/registry_test.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,16 @@ func TestRegistryPushPull(t *testing.T) {
119119
t.Run("docker push/pull single-platform image", func(t *testing.T) {
120120
t.Parallel()
121121

122-
imageName := "busybox:1.37.0-musl"
122+
imageName := "traefik/whoami:v1.11.0"
123123
registryImage := fmt.Sprintf("%s/%s", registryAddr, imageName)
124124
platform := "linux/amd64"
125125
ociPlatform := ocispec.Platform{Architecture: "amd64", OS: "linux"}
126-
indexDigest := "sha256:597bf7e5e8faf26b8efc4cb558eea5dc14d9cc97d5b4c8cdbe6404a7432d5a67"
127-
platformDigest := "sha256:008f65c96291274170bec5cf01b2de06dc049dc9d8f9bfb633520497875ed2c1"
126+
indexDigest := "sha256:200689790a0a0ea48ca45992e0450bc26ccab5307375b41c84dfc4f2475937ab"
127+
platformDigest := "sha256:4f90b33ddca9c4d4f06527070d6e503b16d71016edea036842be2a84e60c91cb"
128128
// Local image digest for the platform when *not* using containerd image store.
129-
dockerLocalDigest := "sha256:7da29d4d35b82e4412a41afd99398c64cc94d58fb5a701c73c684ed22201a14b"
129+
dockerLocalDigest := "sha256:6fee7566e4273ee6078f08e167e36434b35f72152232a5e6f1446288817dabe5"
130130
// Manifest digest created by 'docker push' when *not* using containerd image store.
131-
dockerDistribDigest := "sha256:f6e9a69f79d3bb745090d8bcd1d17ed24c1993d013d7b5b536fb7d0b61018ad7"
131+
dockerDistribDigest := "sha256:4f90b33ddca9c4d4f06527070d6e503b16d71016edea036842be2a84e60c91cb"
132132

133133
t.Cleanup(
134134
func() {
@@ -332,17 +332,17 @@ func TestRegistryPushPull(t *testing.T) {
332332
t.Run("docker pull from partially available multi-platform image", func(t *testing.T) {
333333
t.Parallel()
334334

335-
imageName := "busybox:1.37.0-glibc"
335+
imageName := "traefik/whoami:v1.10.4"
336336
registryImage := fmt.Sprintf("%s/%s", registryAddr, imageName)
337-
indexDigest := "sha256:210ce53959959e79523b8cb0f0bb1cf1c49bf9747cdedb47db1cf0db8e642f61"
338-
amd64Digest := "sha256:7c0ffe5751238c8479f952f3fbc3b719d47bccac0e9bf0a21c77a27cba9ef12d"
339-
arm64Digest := "sha256:68a0d55a75c935e1101d16ded1c748babb7f96a9af43f7533ba83b87e2508b82"
340-
amd64DockerDigest := "sha256:6d3e4188a38af91b0c1577b9e88c53368926b2fe0e1fb985d6e8a70040520c4d"
341-
arm64DockerDigest := "sha256:7b4721e214600044496305a20ca3902677e572127d4d976ed0e54da0137c243a"
337+
indexDigest := "sha256:1699d99cb4b9acc17f74ca670b3d8d0b7ba27c948b3445f0593b58ebece92f04"
338+
amd64Digest := "sha256:02d8fe035f170f91cbb5e458a57f4cefab747436f8244a0eb2d66785fe5e565f"
339+
arm64Digest := "sha256:fd9d367a04f2a76b784d2a0c84933d4cf463a464d3aa4cdec8dba49772cf041d"
340+
amd64DockerDigest := "sha256:9943fa5dfa160113993257e13b514a9d55065aa86a8fcabbf66359d8cf9e1ba5"
341+
arm64DockerDigest := "sha256:088bc76bf19570c774f349e3df96ff77391536eab86c9adff4426de8e2dd5f2c"
342342

343343
// This image has multiple platforms, we'll pull only 2 of them in remote Docker.
344-
availablePlatforms := []string{"linux/amd64", "linux/arm64/v8"}
345-
missingPlatform := "linux/arm/v7"
344+
availablePlatforms := []string{"linux/amd64", "linux/arm64"}
345+
missingPlatform := "linux/arm/v8"
346346

347347
t.Cleanup(func() {
348348
_, err := localCli.ImageRemove(ctx, registryImage, image.RemoveOptions{PruneChildren: true})
@@ -377,7 +377,7 @@ func TestRegistryPushPull(t *testing.T) {
377377
if platform == "linux/amd64" {
378378
assert.Equal(t, amd64DockerDigest, img.ID,
379379
"Image ID for platform '%s' should match digest", platform)
380-
} else if platform == "linux/arm64/v8" {
380+
} else if platform == "linux/arm64" {
381381
assert.Equal(t, arm64DockerDigest, img.ID,
382382
"Image ID for platform '%s' should match digest", platform)
383383
}
@@ -405,11 +405,11 @@ func TestRegistryPushPull(t *testing.T) {
405405

406406
assert.True(t, slices.ContainsFunc(summary[0].Manifests, func(m image.ManifestSummary) bool {
407407
if m.ID == arm64Digest {
408-
assert.True(t, m.Available, "Image content for linux/arm64/v8 should be available", arm64Digest)
408+
assert.True(t, m.Available, "Image content for linux/arm64 should be available", arm64Digest)
409409
return true
410410
}
411411
return false
412-
}), "Image for linux/arm64/v8 should be available")
412+
}), "Image for linux/arm64 should be available")
413413
}
414414

415415
// Test 2: Pull missing platform - should fail with "not found".

0 commit comments

Comments
 (0)