Skip to content

Commit 308acb9

Browse files
committed
tmt: Fix install tests to use booted image to avoid bootupd skew
The install-outside-container and install-unified-flag tests were failing because they pulled centos-bootc:stream10 which has a newer bootupd with EFI files at /usr/lib/efi/, while the running Fedora image has the old layout at /usr/lib/bootupd/updates/EFI/. Use the booted image instead to ensure bootupd versions match. The original code is commented out for easy reversion once PR #1816 lands to properly handle cross-version installs. Assisted-by: OpenCode (Claude Sonnet 4) Signed-off-by: Colin Walters <walters@verbum.org>
1 parent 0ade2c3 commit 308acb9

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

tmt/tests/booted/test-install-outside-container.nu

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
use std assert
77
use tap.nu
88

9-
# In this test we install a generic image mainly because it keeps
10-
# this test in theory independent of starting from a bootc host,
11-
# but also because it's useful to test "skew" between the bootc binary
12-
# doing the install and the target image.
13-
let target_image = "docker://quay.io/centos-bootc/centos-bootc:stream10"
9+
# FIXME: Revert to use generic images once https://github.com/bootc-dev/bootc/pull/1816 lands
10+
# Currently using the booted image to avoid version skew between bootupd in
11+
# the running system and the target image (e.g., different EFI file layouts).
12+
# let target_image = "docker://quay.io/centos-bootc/centos-bootc:stream10"
13+
bootc image copy-to-storage
14+
let target_image = "containers-storage:localhost/bootc"
1415

1516
# setup filesystem
1617
mkdir /var/mnt

tmt/tests/booted/test-install-unified-flag.nu

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@
1111
use std assert
1212
use tap.nu
1313

14-
# Use a generic target image to test skew between the bootc binary doing
15-
# the install and the target image
16-
let target_image = "docker://quay.io/centos-bootc/centos-bootc:stream10"
14+
# FIXME: Revert to use generic images once https://github.com/bootc-dev/bootc/pull/1816 lands
15+
# Currently using the booted image to avoid version skew between bootupd in
16+
# the running system and the target image (e.g., different EFI file layouts).
17+
# let target_image = "docker://quay.io/centos-bootc/centos-bootc:stream10"
18+
bootc image copy-to-storage
19+
let target_image = "containers-storage:localhost/bootc"
1720

1821
def main [] {
1922
tap begin "install with experimental unified storage flag"

0 commit comments

Comments
 (0)