From 893052197d8737902280da48683d606792728670 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 15 Dec 2023 13:20:34 -0800 Subject: [PATCH] Workaround needed comps change for KF6 rebuild https://pagure.io/fedora-comps/pull-request/920 is a required comps change now https://bodhi.fedoraproject.org/updates/FEDORA-2023-ad16578136 landed in stable, but it won't be in the public comps data till after the next compose. This reproduces the same effect on the fly in the KDE kickstart when doing the KDE live image build test, so it will pass. Signed-off-by: Adam Williamson --- tests/_live_build.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/_live_build.pm b/tests/_live_build.pm index a3f4b7b2..a4c51316 100644 --- a/tests/_live_build.pm +++ b/tests/_live_build.pm @@ -79,6 +79,12 @@ sub run { if ($version eq $rawrel) { assert_script_run 'echo "repo --name=koji-rawhide --baseurl=https://kojipkgs.fedoraproject.org/repos/f' . $version . '-build/latest/\$basearch/" >> ' . $repoks; } + # FIXME until the next compose after 2023-12-15 to include + # https://pagure.io/fedora-comps/pull-request/920 , we need to + # hack the same changes into the kickstart for KDE + if ($lcsubv eq "kde" && $version eq $rawrel) { + assert_script_run 'printf "%%packages\nakonadi-server\nakonadi-server-mysql\n-kf5-akonadi-server\n-kf5-akonadi-server-mysql\n%%end\n" >> ' . "fedora-live-${lcsubv}.ks"; + } # now flatten the kickstart assert_script_run "ksflatten -c fedora-live-${lcsubv}.ks -o openqa.ks"; # upload the kickstart so we can check it