From bf4a8ec45432e83598cfdef6f68401c8d326542b Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 25 Jul 2023 18:35:58 -0700 Subject: [PATCH] Enable unified core for ostree composes It got enabled in production, so we should do the same here. Signed-off-by: Adam Williamson --- tests/_ostree_build.pm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/_ostree_build.pm b/tests/_ostree_build.pm index a373500a..8d17ab53 100644 --- a/tests/_ostree_build.pm +++ b/tests/_ostree_build.pm @@ -70,13 +70,11 @@ sub run { assert_script_run "set -o pipefail"; # PULL SOME LEVERS! PULL SOME LEVERS! # This shadows pungi/ostree/tree.py - # FIXME: when https://fedoraproject.org/wiki/Changes/FedoraSilverblueUnifiedCore - # is implemented we should match it by adding --unified-core to the args # Difference from releng: we don't pass --write-commitid-to as it # disables updating the ref with the new commit, and we *do* want # to do that. pungi updates the ref itself, I don't want to copy # all that work in here - assert_script_run "rpm-ostree compose tree --repo=/var/tmp/ostree/repo/ --add-metadata-string=version=${advortask} --force-nocache /workstation-ostree-config/fedora-$lcsubv.yaml |& ts '" . '[%Y-%m-%d %H:%M:%S]' . "' | tee /tmp/ostree.log", 4500; + assert_script_run "rpm-ostree compose tree --unified-core --repo=/var/tmp/ostree/repo/ --add-metadata-string=version=${advortask} --force-nocache /workstation-ostree-config/fedora-$lcsubv.yaml |& ts '" . '[%Y-%m-%d %H:%M:%S]' . "' | tee /tmp/ostree.log", 4500; assert_script_run "set +o pipefail"; upload_logs "/tmp/ostree.log"; # check out the ostree installer lorax templates