testiso: stop checking the ostree commit in the aleph file #4268
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This doesn't work in the container-native path because the ostree-commit in the aleph is from the encapsulation done as part of `build-chunked-oci`, but the `ostree-commit` we embed in `meta.json` is from the imported "merge commit". I _think_ what we need is to tweak our osbuild manifests to use the import path rather than unencapsulate path, and that should result in the merge commit getting inserted in the aleph (but also that would be one less dependency on even having `ostree-commit` in `meta.json` in the first place). Anyway, I think just checking the version string is good enough for our purposes here.
…ners-storage There's no digest to preserve in that case since it's all uncompressed. Relevant only in the `--direct` path.
15 tasks
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request removes a check for the ostree commit in testiso, which was causing issues in container-native paths. The changes in mantle/cmd/kola/testiso.go are correct and align with this goal. In src/cmd-import, the logic for calling skopeo has been adjusted. While functionally correct, I've suggested a small refactoring to improve the command construction for better readability and robustness against future changes in skopeo.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This doesn't work in the container-native path because the
ostree-commit in the aleph is from the encapsulation done as part of
build-chunked-oci, but theostree-commitwe embed inmeta.jsonisfrom the imported "merge commit".
I think what we need is to tweak our osbuild manifests to use the
import path rather than unencapsulate path, and that should result in
the merge commit getting inserted in the aleph (but also that would be
one less dependency on even having
ostree-commitinmeta.jsonin thefirst place).
Anyway, I think just checking the version string is good enough for our
purposes here.