diff --git a/e2e/container/testdata/run-attached-from-remote-and-remove.golden b/e2e/container/testdata/run-attached-from-remote-and-remove.golden index 15e3430c77..7234cf874a 100644 --- a/e2e/container/testdata/run-attached-from-remote-and-remove.golden +++ b/e2e/container/testdata/run-attached-from-remote-and-remove.golden @@ -1,4 +1,4 @@ Unable to find image 'registry:5000/alpine:test-run-pulls' locally test-run-pulls: Pulling from alpine -Digest: sha256:641b95ddb2ea9dc2af1a0113b6b348ebc20872ba615204fbe12148e98fd6f23d +Digest: sha256:e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501 Status: Downloaded newer image for registry:5000/alpine:test-run-pulls diff --git a/e2e/image/push_test.go b/e2e/image/push_test.go index 0bc3402ce7..9098aa0478 100644 --- a/e2e/image/push_test.go +++ b/e2e/image/push_test.go @@ -44,11 +44,11 @@ func TestPushAllTags(t *testing.T) { golden.Assert(t, result.Stderr(), "push-with-content-trust-err.golden") output.Assert(t, result.Stdout(), map[int]func(string) error{ 0: output.Equals("The push refers to repository [registry:5000/push-all-tags]"), - 1: output.Equals("5bef08742407: Preparing"), - 3: output.Equals("latest: digest: sha256:641b95ddb2ea9dc2af1a0113b6b348ebc20872ba615204fbe12148e98fd6f23d size: 528"), - 6: output.Equals("v1: digest: sha256:641b95ddb2ea9dc2af1a0113b6b348ebc20872ba615204fbe12148e98fd6f23d size: 528"), - 9: output.Equals("v1.0: digest: sha256:641b95ddb2ea9dc2af1a0113b6b348ebc20872ba615204fbe12148e98fd6f23d size: 528"), - 12: output.Equals("v1.0.1: digest: sha256:641b95ddb2ea9dc2af1a0113b6b348ebc20872ba615204fbe12148e98fd6f23d size: 528"), + 1: output.Equals("7cd52847ad77: Preparing"), + 3: output.Equals("latest: digest: sha256:e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501 size: 528"), + 6: output.Equals("v1: digest: sha256:e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501 size: 528"), + 9: output.Equals("v1.0: digest: sha256:e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501 size: 528"), + 12: output.Equals("v1.0.1: digest: sha256:e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501 size: 528"), }) } @@ -73,8 +73,8 @@ func TestPushWithContentTrust(t *testing.T) { golden.Assert(t, result.Stderr(), "push-with-content-trust-err.golden") output.Assert(t, result.Stdout(), map[int]func(string) error{ 0: output.Equals("The push refers to repository [registry:5000/trust-push]"), - 1: output.Equals("5bef08742407: Preparing"), - 3: output.Equals("latest: digest: sha256:641b95ddb2ea9dc2af1a0113b6b348ebc20872ba615204fbe12148e98fd6f23d size: 528"), + 1: output.Equals("7cd52847ad77: Preparing"), + 3: output.Equals("latest: digest: sha256:e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501 size: 528"), 4: output.Equals("Signing and pushing trust metadata"), 5: output.Equals(`Finished initializing "registry:5000/trust-push"`), 6: output.Equals("Successfully signed registry:5000/trust-push:latest"), diff --git a/e2e/image/testdata/pull-with-content-trust-err.golden b/e2e/image/testdata/pull-with-content-trust-err.golden index 4b9707cba2..fb570178af 100644 --- a/e2e/image/testdata/pull-with-content-trust-err.golden +++ b/e2e/image/testdata/pull-with-content-trust-err.golden @@ -1 +1 @@ -Tagging registry:5000/trust-pull@sha256:641b95ddb2ea9dc2af1a0113b6b348ebc20872ba615204fbe12148e98fd6f23d as registry:5000/trust-pull:latest +Tagging registry:5000/trust-pull@sha256:e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501 as registry:5000/trust-pull:latest diff --git a/e2e/image/testdata/pull-with-content-trust.golden b/e2e/image/testdata/pull-with-content-trust.golden index 9cb9a92a17..b21407e117 100644 --- a/e2e/image/testdata/pull-with-content-trust.golden +++ b/e2e/image/testdata/pull-with-content-trust.golden @@ -1,5 +1,5 @@ -Pull (1 of 1): registry:5000/trust-pull:latest@sha256:641b95ddb2ea9dc2af1a0113b6b348ebc20872ba615204fbe12148e98fd6f23d -sha256:641b95ddb2ea9dc2af1a0113b6b348ebc20872ba615204fbe12148e98fd6f23d: Pulling from trust-pull -Digest: sha256:641b95ddb2ea9dc2af1a0113b6b348ebc20872ba615204fbe12148e98fd6f23d -Status: Downloaded newer image for registry:5000/trust-pull@sha256:641b95ddb2ea9dc2af1a0113b6b348ebc20872ba615204fbe12148e98fd6f23d +Pull (1 of 1): registry:5000/trust-pull:latest@sha256:e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501 +sha256:e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501: Pulling from trust-pull +Digest: sha256:e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501 +Status: Downloaded newer image for registry:5000/trust-pull@sha256:e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501 registry:5000/trust-pull:latest diff --git a/e2e/internal/fixtures/fixtures.go b/e2e/internal/fixtures/fixtures.go index 4672a0ad3a..8fcc6248ec 100644 --- a/e2e/internal/fixtures/fixtures.go +++ b/e2e/internal/fixtures/fixtures.go @@ -17,7 +17,7 @@ const ( // AlpineImage is an image in the test registry AlpineImage = "registry:5000/alpine:frozen" // AlpineSha is the sha of the alpine image - AlpineSha = "641b95ddb2ea9dc2af1a0113b6b348ebc20872ba615204fbe12148e98fd6f23d" + AlpineSha = "e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501" // BusyboxImage is an image in the test registry BusyboxImage = "registry:5000/busybox:frozen" // BusyboxSha is the sha of the busybox image diff --git a/scripts/test/e2e/load-image b/scripts/test/e2e/load-image index ddedb26213..410d836087 100755 --- a/scripts/test/e2e/load-image +++ b/scripts/test/e2e/load-image @@ -2,7 +2,7 @@ # Fetch images used for e2e testing set -eu -o pipefail -alpine_src=alpine@sha256:f006ecbb824d87947d0b51ab8488634bf69fe4094959d935c0c103f4820a417d +alpine_src=alpine@sha256:69665d02cb32192e52e07644d76bc6f25abeb5410edc1c7a81a10ba3f0efb90a alpine_dest=registry:5000/alpine:frozen busybox_src=busybox@sha256:3e8fa85ddfef1af9ca85a5cfb714148956984e02f00bec3f7f49d3925a91e0e7