1
0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-22 05:53:09 +00:00

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 <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-12-15 13:20:34 -08:00
parent 107715a3de
commit 893052197d

View File

@ -79,6 +79,12 @@ sub run {
if ($version eq $rawrel) { if ($version eq $rawrel) {
assert_script_run 'echo "repo --name=koji-rawhide --baseurl=https://kojipkgs.fedoraproject.org/repos/f' . $version . '-build/latest/\$basearch/" >> ' . $repoks; 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 # now flatten the kickstart
assert_script_run "ksflatten -c fedora-live-${lcsubv}.ks -o openqa.ks"; assert_script_run "ksflatten -c fedora-live-${lcsubv}.ks -o openqa.ks";
# upload the kickstart so we can check it # upload the kickstart so we can check it