Skip to content

Commit 3181bb5

Browse files
committed
tests: Fix examples-build to work on non-fsverity hosts
I'm changing the default fs for Fedora in our CI to be xfs arbitrarily. This code SHOULD work on non-fsverity hosts, and the other code path in `tests/build-sealed` does. Also, the remainder of the stuff was dead code so just drop it. Signed-off-by: Colin Walters <[email protected]>
1 parent f8ce015 commit 3181bb5

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

tmt/tests/examples/bootc-uki/build.final

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ cp /usr/bin/bootc .
99
rm -rf tmp/sysroot
1010
mkdir -p tmp/sysroot/composefs
1111

12+
# TODO port this over to container compute-composefs-digest
1213
IMAGE_ID="$(sed s/sha256:// tmp/iid)"
13-
./bootc internals cfs --repo tmp/sysroot/composefs oci pull containers-storage:"${IMAGE_ID}"
14-
COMPOSEFS_FSVERITY="$(./bootc internals cfs --repo tmp/sysroot/composefs oci compute-id --bootable "${IMAGE_ID}")"
14+
./bootc internals cfs --repo tmp/sysroot/composefs --insecure oci pull containers-storage:"${IMAGE_ID}"
15+
COMPOSEFS_FSVERITY="$(./bootc internals cfs --repo tmp/sysroot/composefs --insecure oci compute-id --bootable "${IMAGE_ID}")"
1516

1617
# See: https://wiki.archlinux.org/title/Unified_Extensible_Firmware_Interface/Secure_Boot
1718
# Alternative to generate keys for testing: `sbctl create-keys`
@@ -37,9 +38,3 @@ sudo podman build \
3738
--secret=id=key,src=secureboot/db.key \
3839
--secret=id=cert,src=secureboot/db.crt \
3940
--iidfile=tmp/iid2
40-
41-
rm -rf tmp/efi
42-
mkdir -p tmp/efi
43-
./bootc internals cfs --repo tmp/sysroot/composefs oci pull containers-storage:"${IMAGE_ID}"
44-
./bootc internals cfs --repo tmp/sysroot/composefs oci compute-id --bootable "${IMAGE_ID}"
45-
./bootc internals cfs --repo tmp/sysroot/composefs oci prepare-boot "${IMAGE_ID}" --bootdir tmp/efi

0 commit comments

Comments
 (0)