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: fix manifest e2e test assumption #21878

Merged

Conversation

giuseppe
Copy link
Member

fix an assumption in the test, that the --compression-format is unchanged from the original image.

Instead validate that all the required architectures are part of the manifest.

Does this PR introduce a user-facing change?

None

Copy link
Contributor

openshift-ci bot commented Feb 29, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 29, 2024
@giuseppe giuseppe force-pushed the fix-manifest-test-assumption branch from b743ae4 to 2243de6 Compare February 29, 2024 14:52
@rhatdan
Copy link
Member

rhatdan commented Feb 29, 2024

LGTM

Copy link
Collaborator

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

Just one comment nit, really.

@@ -16,6 +17,50 @@ import (
imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
)

// validateManifestHasAllArchs checks that the specified manifest has all
// the archs in `imageListInstance`
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// the archs in `imageListInstance`
// the archs in `imageList`

; imageListInstance seems to refer to the individual imageListARM64InstanceDigest platform.

Aesthetically I’d prefer this to be a neutral utility, with the list of expected architectures passed by the individual test as a parameter (and possibly an imageListAllArchitectures constant, near imageList, used to hold that value).

test/e2e/manifest_test.go Outdated Show resolved Hide resolved
fix an assumption in the test, that the --compression-format is
unchanged from the original image.

Instead validate that all the required architectures are part of the
manifest.

Signed-off-by: Giuseppe Scrivano <[email protected]>
@giuseppe giuseppe force-pushed the fix-manifest-test-assumption branch from 2243de6 to c50826c Compare February 29, 2024 17:13
@rhatdan
Copy link
Member

rhatdan commented Feb 29, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 29, 2024
@rhatdan rhatdan added the 5.0 label Feb 29, 2024
@TomSweeneyRedHat
Copy link
Member

LGTM

@openshift-merge-bot openshift-merge-bot bot merged commit 41fa1c2 into containers:main Feb 29, 2024
94 checks passed
@mtrmac
Copy link
Collaborator

mtrmac commented Mar 1, 2024

Thanks again!

@stale-locking-app stale-locking-app bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label May 31, 2024
@stale-locking-app stale-locking-app bot locked as resolved and limited conversation to collaborators May 31, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
5.0 approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants