Do clean up in cosa for bootc v1.6.0 #4285
Draft
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
|
Skipping CI for Draft Pull Request. |
Looks like the issue still exist in the latest bootc version. |
jlebon
reviewed
Sep 5, 2025
| assert len(refs) == 1 | ||
| subprocess.check_call(['ostree', 'refs', '--repo', tmpd, refs[0], '--create', ref]) | ||
| subprocess.check_call(['ostree', 'container', 'image', 'pull', | ||
| '--ostree-digestfile', f'{parent_tmpd}/digestfile', |
There was a problem hiding this comment.
Can't this just be tmpd instead of parent_tmpd?
|
|
||
| # Read the digestfile and get the ref | ||
| with open(f'{parent_tmpd}/digestfile', 'r') as f: | ||
| ostree_commit = f.read().splitlines()[0] |
There was a problem hiding this comment.
Hmm, we shouldn't need splitlines()[0]?
| @@ -367,6 +367,8 @@ def import_oci_archive(parent_tmpd, ociarchive, ref): | |||
| Imports layered/non-encapsulated OCI archive into the tmp/repo. Returns | |||
| the OSTree commit that was imported. | |||
| ''' | |||
|
|
|||
| ostree_commit = '' | |||
I think the issue there is that we needed new enough rpm-ostree (v2025.10, which pulls in the newer ostree-ext) in the starting disk image, i.e. the qcow2 that |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
As bootc v1.6.0 is expected to fix the reproducibility of ostree commit, these changes mainly contains changes to use ostree commit from meta.json
Closes: #4275