Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test(e2e): migrate oras cp and oras discover specs to ZOT #1093

Merged
merged 60 commits into from
Sep 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
f61b791
test(e2e): add zot
qweeah Aug 22, 2023
06abf60
add auth tests
qweeah Aug 22, 2023
8e644c6
uncomment changes
qweeah Aug 23, 2023
0c7a3ee
move auth and scenario suite to zot
qweeah Aug 23, 2023
35d8bd4
add password
qweeah Aug 23, 2023
1700e23
update description
qweeah Aug 23, 2023
7267ca4
separate prepare script out
qweeah Aug 23, 2023
a2cc4ea
check in zot config
qweeah Aug 23, 2023
e5f7398
add run access
qweeah Aug 23, 2023
2feed93
fix prepare bug
qweeah Aug 23, 2023
96fc889
remove prepare changes
qweeah Aug 24, 2023
2c2b597
run zot container via current user
qweeah Aug 25, 2023
6f9f3c2
rename zot
qweeah Aug 25, 2023
0a00292
add images repo for command suite and attach tests
qweeah Aug 25, 2023
3d60a75
update blob tests
qweeah Aug 25, 2023
c79ba60
Merge remote-tracking branch 'origin_src/main' into zot-attach
qweeah Aug 25, 2023
6e1998b
Merge remote-tracking branch 'origin_src/main' into zot-blob
qweeah Aug 28, 2023
d3d747b
Merge remote-tracking branch 'origin_src/main' into zot-attach
qweeah Aug 28, 2023
8efd185
add doc
qweeah Aug 28, 2023
f3cf89e
doc clean
qweeah Aug 28, 2023
8295d85
Merge branch 'zot-attach' into zot-blob
qweeah Aug 28, 2023
dea043d
fix e2e
qweeah Aug 28, 2023
1945b87
test(e2e): migrate `oras push` specs to ZOT
qweeah Aug 28, 2023
f028e61
fix e2e
qweeah Aug 28, 2023
a25d23f
fix e2e
qweeah Aug 29, 2023
003072a
Merge branch 'zot-push' into zot-pull
qweeah Aug 29, 2023
df78bef
test(e2e): migrate specs for `oras pull`
qweeah Aug 29, 2023
1e9bbd8
fix e2e
qweeah Aug 29, 2023
e2a4c38
Merge branch 'zot-push' into zot-pull
qweeah Aug 29, 2023
003c2c9
test(e2e): migrate `oras tag` specs to ZOT
qweeah Aug 29, 2023
e654e06
test(e2e): migrate `oras tag` specs to ZOT
qweeah Aug 29, 2023
d57f9bc
test(e2e): migrate `oras repo` specs to ZOT
qweeah Aug 29, 2023
0c7187c
remove focus
qweeah Aug 29, 2023
b42c474
Merge remote-tracking branch 'origin_src/main' into zot-blob
qweeah Aug 29, 2023
1f18415
test(e2e): migrate `oras repo` specs to ZOT
qweeah Aug 29, 2023
670ac47
Merge branch 'zot-blob' into zot-repo
qweeah Aug 29, 2023
cd370e3
test(e2e): migrate `oras manifest` specs to ZOT
qweeah Aug 29, 2023
313073d
move invalid pushing to fallback distribution
qweeah Aug 29, 2023
98be084
remove focus
qweeah Aug 29, 2023
69ef80d
Merge remote-tracking branch 'origin_src/main' into zot-manifest
qweeah Aug 30, 2023
d657c2f
test(e2e): migrate `oras cp` specs to ZOT
qweeah Aug 30, 2023
c6a290d
rebake test data for distribution
qweeah Aug 30, 2023
67d0556
add foobar referrers to ZOT
qweeah Aug 30, 2023
b6e10c5
update testdata constants
qweeah Aug 30, 2023
ba8de9a
update doc
qweeah Aug 31, 2023
095da7e
Merge branch 'zot-testdata' into zot-cp
qweeah Aug 31, 2023
a75205c
fix e2e
qweeah Aug 31, 2023
eded767
add test data
qweeah Aug 31, 2023
8d8745e
add linux amd64 referrers data
qweeah Aug 31, 2023
67d31de
test(e2e): migrate `oras discover` specs to ZOT
qweeah Aug 31, 2023
df7ec84
Merge branch 'zot-discover' into zot-cp
qweeah Aug 31, 2023
88e64fb
fix e2e
qweeah Aug 31, 2023
2150f68
Merge branch 'zot-discover' into zot-cp
qweeah Aug 31, 2023
0a981d8
add cp spec back
qweeah Aug 31, 2023
a49f6e9
add old artifact consumption test
qweeah Aug 31, 2023
4b84e54
rebake test data
qweeah Aug 31, 2023
a90495d
rebake test data
qweeah Aug 31, 2023
ac755e5
Merge branch 'zot-testdata' into zot-cp
qweeah Sep 1, 2023
0dd5b3c
Merge remote-tracking branch 'origin_src/main' into zot-cp
qweeah Sep 1, 2023
f9f65bb
Merge remote-tracking branch 'origin_src' into zot-cp
qweeah Sep 1, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ test/e2e/testdata/distribution/mount_fallback/docker/

# OCI Layout Files ZOT storage files for local E2E testing
test/e2e/testdata/zot/
!test/e2e/testdata/zot/command/images/
!test/e2e/testdata/zot/command/artifacts/
!test/e2e/testdata/zot/command/blobs/
!test/e2e/testdata/zot/command/images/**/*
!test/e2e/testdata/zot/command/artifacts/**/*
!test/e2e/testdata/zot/command/blobs/**/*
!test/e2e/testdata/zot/config.json
!test/e2e/testdata/zot/passwd_bcrypt
1 change: 1 addition & 0 deletions test/e2e/internal/testdata/foobar/const.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ var (
{Digest: "8d7a27ff2662", Name: "application/vnd.oci.artifact.manifest.v1+json"},
{Digest: "2dbea575a349", Name: "application/vnd.oci.artifact.manifest.v1+json"},
}

ImageReferrersStateKeys = []match.StateKey{
{Digest: "0cb8c4da7e9f", Name: "application/vnd.oci.image.manifest.v1+json"},
{Digest: "e2c6633a7998", Name: "application/vnd.oci.image.manifest.v1+json"},
Expand Down
16 changes: 9 additions & 7 deletions test/e2e/internal/testdata/multi_arch/const.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,16 @@ var (
Manifest = `{"mediaType":"application/vnd.oci.image.index.v1+json","schemaVersion":2,"manifests":[{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"sha256:9d84a5716c66a1d1b9c13f8ed157ba7d1edfe7f9b8766728b8a1f25c0d9c14c1","size":458,"platform":{"architecture":"amd64","os":"linux"}},{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"sha256:4f93460061882467e6fb3b772dc6ab72130d9ac1906aed2fc7589a5cd145433c","size":458,"platform":{"architecture":"arm64","os":"linux"}},{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"sha256:58efe73e78fe043ca31b89007a025c594ce12aa7e6da27d21c7b14b50112e255","size":458,"platform":{"architecture":"arm","os":"linux","variant":"v7"}}]}`
Descriptor = `{"mediaType":"application/vnd.oci.image.index.v1+json","digest":"sha256:e2bfc9cc6a84ec2d7365b5a28c6bc5806b7fa581c9ad7883be955a64e3cc034f","size":706}`
AnnotatedDescriptor = `{"mediaType":"application/vnd.oci.image.index.v1+json","digest":"sha256:e2bfc9cc6a84ec2d7365b5a28c6bc5806b7fa581c9ad7883be955a64e3cc034f","size":706,"annotations":{"org.opencontainers.image.ref.name":"multi"}}`
IndexReferrerDigest = "sha256:d3cf790759b006e1a2aeee52f9b1ee250bb848fce7e873b992b86bf9408f12d0"
IndexReferrerDigest = "sha256:d37baf66300b9006b0f4c7102075d56b970fbf910be5c6bca07fdbb000dfa383"
IndexReferrerStateKey = match.StateKey{Digest: "d3cf790759b0", Name: "application/vnd.oci.image.manifest.v1+json"}
IndexReferrerConfigStateKey = match.StateKey{Digest: "44136fa355b3", Name: "referrer.index"}
IndexReferrerConfigStateKey = match.StateKey{Digest: "44136fa355b3", Name: "referrer/index"}
IndexStateKeys = []match.StateKey{
{Digest: "2ef548696ac7", Name: "hello.tar"},
{Digest: "fe9dbc99451d", Name: "application/vnd.oci.image.config.v1+json"},
{Digest: "9d84a5716c66", Name: "application/vnd.oci.image.manifest.v1+json"},
}
// below are newly baked artifacts for ZOT
IndexZOTReferrerStateKey = match.StateKey{Digest: "d37baf66300b", Name: "application/vnd.oci.image.manifest.v1+json"}
)

// child images
Expand All @@ -51,17 +53,17 @@ var (
LinuxAMD64ConfigDesc = `{"mediaType":"application/vnd.oci.image.config.v1+json","digest":"sha256:fe9dbc99451d0517d65e048c309f0b5afb2cc513b7a3d456b6cc29fe641386c5","size":53}`
LinuxAMD64Referrer = ocispec.Descriptor{
MediaType: "application/vnd.oci.image.manifest.v1+json",
Digest: digest.Digest("sha256:57e6462826c85be15f22f824666f6b467d488fa7bc7e2975f43a2fae27a24ef0"),
Digest: digest.Digest("sha256:c5e00045954a70e3fd28307dd543d4cc158946117943700b8f520f72ddca031f"),
Annotations: map[string]string{
"org.opencontainers.image.created": "2023-02-15T07:56:34Z",
"subject": "linux/amd64",
},
ArtifactType: "referrer.image",
Size: 481,
ArtifactType: "referrer/image",
Size: 482,
}
LayerName = "hello.tar"
LinuxAMD64ReferrerStateKey = match.StateKey{Digest: "57e6462826c8", Name: "application/vnd.oci.image.manifest.v1+json"}
LinuxAMD64ReferrerConfigStateKey = match.StateKey{Digest: "44136fa355b3", Name: "referrer.image"}
LinuxAMD64ReferrerStateKey = match.StateKey{Digest: "c5e00045954a", Name: "application/vnd.oci.image.manifest.v1+json"}
LinuxAMD64ReferrerConfigStateKey = match.StateKey{Digest: "44136fa355b3", Name: "referrer/image"}
LinuxAMD64StateKeys = []match.StateKey{
{Digest: "9d84a5716c66", Name: "application/vnd.oci.image.manifest.v1+json"},
{Digest: "fe9dbc99451d", Name: "application/vnd.oci.image.config.v1+json"},
Expand Down
Loading
Loading