srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-11 17:34:23 +00:00
Code Issues Releases Activity

ostree: only use --unified-core on F39+

Browse Source 
I think it's breaking F37 and F38 tests, not surprisingly as we
didn't do all the fixes there.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-07-27 12:26:23 -07:00
parent bf4a8ec454
commit ba1d492416
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/_ostree_build.pm
View File

@ -74,7 +74,11 @@ sub run {
# disables updating the ref with the new commit, and we *do* want # 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 # to do that. pungi updates the ref itself, I don't want to copy
# all that work in here # all that work in here
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; # we use --unified-core on F39+ as that's where it was turned on
# in prod
my $ucarg = "";
$ucarg = "--unified-core " if ($version > 38);
assert_script_run "rpm-ostree compose tree ${ucarg}--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"; assert_script_run "set +o pipefail";
upload_logs "/tmp/ostree.log"; upload_logs "/tmp/ostree.log";
# check out the ostree installer lorax templates # check out the ostree installer lorax templates