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

tests/e2e-update: Bump to f34 grub #203

Merged
merged 3 commits into from
Sep 3, 2021
Merged

Conversation

cgwalters
Copy link
Member

@cgwalters cgwalters commented Jul 21, 2021

Need to tweak this to auto-detect gold versus updates, or
probably better just synthesize an update.

@lucab
Copy link
Contributor

lucab commented Jul 22, 2021

I admittedly don't understand much about the CI setup here, but you did previously NAK this exact patch at #184 (comment) so I have the feeling this isn't really the path you wanted to follow.

@cgwalters
Copy link
Member Author

but you did previously NAK this exact patch at #184 (comment) so I have the feeling this isn't really the path you wanted to follow.

Hah. Oops. Thanks for pointing that out. Clearly the bespoke CI setup here has escaped my ability to understand it.

Closes: coreos#193

When we switched to a split buildroot/cosa containers, this
broke.  We can just delete this line because the code-under-test is in
`overrides/rootfs`, so doing `rm overrides/rpm/*` won't remove it.
@cgwalters
Copy link
Member Author

Hum, interesting.

�[2J�[01;01H�[=3h�[2J�[01;01H�[0m�[35m�[40m�[0m�[37m�[40mBdsDxe: loading Boot0001 "UEFI Misc Device" from PciRoot(0x0)/Pci(0x7,0x0)
BdsDxe: starting Boot0001 "UEFI Misc Device" from PciRoot(0x0)/Pci(0x7,0x0)
�[0m�[37m�[44m�[01;01HÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿�[02;01H³                           Boot Option Restoration                            ³�[03;01H³                                                                              ³�[04;01H³                                                                              ³�[05;01H³                                                                              ³�[06;01H³                                                                              ³�[07;01H³                                                                              ³�[08;01H³                                                                              ³�[09;01H³                                                                              ³�[10;01H³                                                                              ³�[11;01H³                                                                              ³�[12;01H³                                                                              ³�[13;01H³                                                                              ³�[14;01H³                                                                              ³�[15;01H³                                                                              ³�[16;01H³                                                                              ³�[17;01H³                                                                              ³�[18;01H³                                                                              ³�[19;01H³                                                                              ³�[20;01H³                                                                              ³�[21;01H³                                                                              ³�[22;01H³                                                                              ³�[23;01H³                                                                              ³�[24;01HÀÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ�[13;24HPress any key to stop system reset�[23;03HBooting in 5 seconds  �[23;03HBooting in 4 seconds  �[23;03HBooting in 3 seconds  �[23;03HBooting in 2 seconds  �[23;03HBooting in 1 second   �[03;01H�[0m�[37m�[40mReset System
�[2J�[01;01H�[=3h�[2J�[01;01H�[0m�[35m�[40m�[0m�[37m�[40mBdsDxe: loading Boot0003 "Fedora" from HD(2,GPT,18A4ECF1-589D-4677-9041-31B8C1047AFB,0x1000,0x3F800)/\EFI\fedora\shimx64.efi
BdsDxe: starting Boot0003 "Fedora" from HD(2,GPT,18A4ECF1-589D-4677-9041-31B8C1047AFB,0x1000,0x3F800)/\EFI\fedora\shimx64.efi
error: ../../grub-core/commands/search.c:296:no such device: boot.

�[0m�[30m�[40m�[2J�[01;01H�[0m�[37m�[40merror: ../../grub-core/commands/boot.c:146:you need to load the kernel first.

�[0m�[30m�[40m�[2J�[01;01H�[0m�[37m�[40m      Minimal BASH-like line editing is supported. For the first word,    

      TAB lists possible command completions. Anywhere else TAB lists     

      possible device or file completions.                                



grub> 

This looks like we're just dead at the UEFI console, which implies we may have broken things, or FCOS broke somehow here.

@cgwalters
Copy link
Member Author

OK this is easily replicable locally, which is cool. However, I still have no idea what's going wrong. It looks like the underlying error is:

error: ../../grub-core/commands/search.c:296:no such device: boot.

But I can boot the image in bios mode just fine, and I see a filesystem with label=boot as expected.

@cgwalters
Copy link
Member Author

OK so inverting the order of the grub builds made things pass for me. I think grub2-2.06~rc1-3.fc34 is just broken. (And here we're not rebooting into it, just using it as an upgrade target).

What we clearly should be doing instead is synthesizing an RPM with modified binaries, to avoid any dependency on versions or random GRUB builds.

@cgwalters cgwalters changed the title ci: Drop unnecessary rerun of make+make install tests/e2e-update: Bump to f34 grub Sep 2, 2021
@bgilbert bgilbert linked an issue Sep 3, 2021 that may be closed by this pull request
Copy link
Contributor

@bgilbert bgilbert left a comment

Choose a reason for hiding this comment

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

LGTM, thanks.

.cci.jenkinsfile Outdated Show resolved Hide resolved
Copy link
Member

@travier travier left a comment

Choose a reason for hiding this comment

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

LGTM with @bgilbert suggestion but why does that comment not apply anymore?

So we can debug this.
Need to tweak this to auto-detect gold versus updates, or
probably better just synthesize an update.
@cgwalters
Copy link
Member Author

why does that comment not apply anymore?

I was wrong previously; see this bit which does inject the binaries-under-test:

mv insttree/* overrides/rootfs/

We can also cross-verify after this merges with a PR that breaks bootupd.

@cgwalters cgwalters merged commit 499d9aa into coreos:main Sep 3, 2021
cgwalters added a commit to cgwalters/bootupd that referenced this pull request Nov 29, 2021
This is the F35 equivalent of
coreos#203

Closes: coreos#242
@cgwalters cgwalters mentioned this pull request Nov 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CI is failing
4 participants