tests: update grub2 version to F44#1101
Conversation
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request updates the end-to-end update test script (tests/e2e-update/e2e-update.sh) to use Fedora 44 (F44) packages instead of Fedora 43 (F43) for the grub2 overrides. Specifically, it bumps the starting image grub2 version to grub2-2.12-56.fc44 and the update ostree grub2 version to grub2-2.12-58.fc44. There are no review comments to address.
|
Made it further than before at least. New error: |
|
As this is related to a Fedora rebase, I think we should add an entry in the Fedora CoreOS rebase template to mention updating the CI here. |
Sure yeah. That's this right: https://github.com/coreos/fedora-coreos-tracker/blob/main/.github/ISSUE_TEMPLATE/rebase.md |
|
Yes |
|
Yeah basically every 6 months the CI in everything using the CoreOS CI (this project, ostree, rpm-ostree) tends to break because they just float to $latest but have things that are actually quite sensitive to the OS content. (I suspect this is less true of say Ignition). I think all of these things need to use version-pinned inputs. Now the other big thing that this relates to is migrating off of CoreOS CI entirely. |
|
Made it past the e2e test this time, but in the kola step, + bootupctl status
++ rpm -q grub2-common --qf '%{EVR}'
+ evr=1:2.12-58.fc44
+ assert_file_has_content_literal out.txt 'Component EFI'
+ fpath=out.txt
+ shift
+ for s in "$@"
+ grep -q -F -e 'Component EFI' out.txt
+ false
+ assert_file_has_content_literal out.txt ' Installed: grub2-efi-x64-'
+ fpath=out.txt
+ shift
+ for s in "$@"
+ grep -q -F -e ' Installed: grub2-efi-x64-' out.txt
+ _fatal_print_file out.txt 'File '\''out.txt'\'' doesn'\''t match fixed string list '\'' Installed: grub2-efi-x64-'\'''
+ file=out.txt
+ shift
+ ls -al out.txt
-rw-r--r--. 1 root root 266 May 27 14:18 out.txt
+ sed -e 's/^/# /'
# Component BIOS
# Installed: grub2-tools-1:2.12-58.fc44.x86_64
# Update: At latest version
# Component EFI
# Installed: grub2-1:2.12-58.fc44,shim-16.1-5
# Update: At latest version
# No components are adoptable.
# CoreOS aleph version: 44.20260527.20.dev3
# Boot method: EFI
+ fatal 'File '\''out.txt'\'' doesn'\''t match fixed string list '\'' Installed: grub2-efi-x64-'\'''
+ echo error: File ''\''out.txt'\''' 'doesn'\''t' match fixed string list \' Installed: 'grub2-efi-x64-'\'''
error: File 'out.txt' doesn't match fixed string list ' Installed: grub2-efi-x64-'
+ exit 1
+ cleanup
+ test -z ''
+ test -f /tmp/tmp.4q2wXkYfPg/.testtmp
+ cd /
+ rm /tmp/tmp.4q2wXkYfPg -rf
systemd[1]: kola-runext.service: Main process exited, code=exited |
Fix following fbb5911 so that we actually check the existence of the /usr/lib/efi dir correctly by expanding the existing variable
It's a change from grub2-efi-x64 (subpackage) to grub2 (source package name). This is related to the changes we did for https://fedoraproject.org/wiki/Changes/BootLoaderUpdatesPhase1 that are now live in F44. |
Well, I would say that we should keep the CoreOS CI running to cover the CoreOS specific bits and add more CI based on bootc base images. |
When using /usr/lib/efi, metadata is derived from the directory structure so deleting EFI.json doesn't cause bootupctl update to fail.
|
|
dnf sometimes leaves behind files in /tmp, causing the bootc container lint to fail. Let's just manually clean up /tmp to avoid this flake.
Would we do this by pinning a |
|
All CI passing now, I'll let you have another look just in case before merging @travier |
|
Thank you!! |
|
No problem, thanks for merging |
3 participants
Working off of 4fedddb, and testing if this can close #1100
If it does, maybe this should be made more dynamic to reduce the maintenance burden.