Uki print dump diff fix - #2370
Open
Johan-Liebert1 wants to merge 4 commits into
Open
Conversation
Johan-Liebert1
force-pushed
the
uki-print-dump-diff-fix
branch
4 times, most recently
from
August 10, 2026 09:08
25d76a9 to
023c353
Compare
Collaborator
Author
|
:/ grub-cc tests failing due to some upstream bug where LoaderInfo efivar returns Grub as the bootloader |
Collaborator
Author
|
It was probably this commit https://src.fedoraproject.org/rpms/grub2/c/fedae6ebf3e06c6a02dd8aa90e4277292575eb86?branch=rawhide |
gursewak1997
added
ci/merge
gursewak1997
left a comment
gursewak1997
left a comment
Contributor
There was a problem hiding this comment.
Looks good mostly; just a few nits
The dumpfile diff was not being performed in the update/switch operations which was causing the dumpfile test to fail. Refactor out the diffing code to also run in the update/switch operations. Another major issue was `/boot` being masked in the EROFS which caused us to not find the dumpfile when reading from the EROFS. Update to read from the filesystem, create tmpfiles and run diff on the tmpfiles Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
We were not computing the bootable digest which caused assertions to fail Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
The CentOS Stream 9 base image ships policycoreutils-3.6-9, which is newer than any version that python3-policycoreutils (a cloud-init dependency) currently matches in the repos. When cloud-init is in the same DNF transaction as the explicit policycoreutils install from packages.txt, --allowerasing cannot downgrade policycoreutils because it is pinned by the same request. Move cloud-init out of packages.txt and install it in its own transaction so --allowerasing can freely resolve the version conflict. AssistedBy: AI Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
Possibly due to https://src.fedoraproject.org/rpms/grub2/c/fedae6ebf3e06c6a02dd8aa90e4277292575eb86?branch=rawhide commit, grub cc now reports Grub as the bootloader on efivars inspection. For now comment out the grub cc in the CI matrix until we have an upstream fix Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
Johan-Liebert1
force-pushed
the
uki-print-dump-diff-fix
branch
from
August 12, 2026 04:14
dbf782d to
e99e638
Compare
gursewak1997
approved these changes
Aug 12, 2026
Collaborator
Author
|
https://github.com/bootc-dev/bootc/actions/runs/31562640440/job/94023684221?pr=2370 is failing due to the deadlock in #2315 and ig we don't have a new enough bootc in the base images yet |
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
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.
uki: Fix dumpfile diffing
The dumpfile diff was not being performed in the update/switch
operations which was causing the dumpfile test to fail. Refactor out the
diffing code to also run in the update/switch operations.
Another major issue was
/bootbeing masked in the EROFS which causedus to not find the dumpfile when reading from the EROFS. Update to read
from the filesystem, create tmpfiles and run diff on the tmpfiles
tmt: Fix and re-enable uki-dumpfile test
We were not computing the bootable digest which caused assertions to
fail