diff options
| author | Matthew Kobayashi <matthew@kobayashi.au> | 2026-10-22 10:56:15 +1000 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2026-11-10 18:32:23 +0100 |
| commit | 1312d5df3a4375502eb134d29a4a678f7c1ab0f9 (patch) | |
| tree | 7b4cdff6689cd9f0db6bf90b8178a103125373f5 /scripts | |
| parent | 67f05fefc9085c39d9b0de5c2de1a0759aaf24c2 (diff) | |
| download | vyos-build-1312d5df3a4375502eb134d29a4a678f7c1ab0f9.tar.gz vyos-build-1312d5df3a4375502eb134d29a4a678f7c1ab0f9.zip | |
smoketest: T9402: more robust GRUB menu selection
The live ISO's UEFI GRUB menu was navigated with arrow keys sent on fixed
sleeps, so a missed keystroke booted the wrong entry.
The harness now waits for the autoboot countdown, sends one key at a time and
waits for GRUB to highlight the expected entry before sending the next,
restarting from the first entry if an acknowledgement is missing. Navigation
uses Ctrl-A and Ctrl-N instead of multi-byte arrow-key escape sequences, which
are less reliable on the EFI console. The run fails if GRUB never confirms the
serial console entry.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/check-qemu-install | 56 |
1 files changed, 42 insertions, 14 deletions
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index cabda683..9b63e90f 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -644,21 +644,49 @@ def BOOTLOADERchooseSerialConsole(child, live: bool) -> None: # XXX: UEFI systems directly load GRUB, BIOS systems fallback to ISOLINUX if live and args.uefi: - # Let UEFI start before GRUB - child.expect(UEFI_STRING, timeout=BOOTLOADER_TMO) - # Wait for GRUB - child.expect(GRUB_STRING, timeout=BOOTLOADER_TMO) - time.sleep(BOOTLOADER_LOAD_TMO) + def expectSelected(title, timeout=15) -> bool: + try: + child.expect_exact(b'*' + title, timeout=timeout) + except (pexpect.TIMEOUT, pexpect.EOF): + recent = child.before[-1500:] + log.warning( + f'GRUB did not confirm selection of {title!r}; ' + f'recent output: {recent!r}' + ) + return False + return True + + # The countdown is printed after all menu entries have been drawn. + child.expect( + rb'The highlighted entry will be executed automatically in \d+s\.', + timeout=120, + ) - # Select GRUB serial console - # Key DOWN -> fail-safe mode - child.send(KEY_DOWN) - time.sleep(BOOTLOADER_SLEEP) - # Key DOWN -> Serial Console boot - child.send(KEY_DOWN) - time.sleep(BOOTLOADER_SLEEP) - # Boot - child.send(KEY_RETURN) + # A missing acknowledgement does not tell us whether the key was received. + # Restart from Home instead of repeating Down from an unknown selection. + for _ in range(3): + if child.eof(): + return + + # Ctrl-A is Home without the EFI console's escape-sequence parsing. + child.sendcontrol('a') + # Retry a dropped Home before the 10-second autoboot timeout expires. + if not expectSelected(b'Live system (vyos) - KVM console', timeout=1): + continue + + for title in ( + b'Live system (vyos fail-safe mode)', + b'Live system (vyos) - Serial console', + ): + # Ctrl-N is Down without the escape-sequence parsing of arrow keys. + child.sendcontrol('n') + if not expectSelected(title): + break + else: + child.send(b'\r') + return + + raise RuntimeError('Failed to confirm GRUB serial console boot selection after 3 attempts') elif live and not args.uefi: # Wait for ISOLINUX child.expect(ISOLINUX_STRING, timeout=BOOTLOADER_TMO) |
