From 81d5d2f408458baf09e1afa65f0ca67670d387bd Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 15 Oct 2024 12:47:00 -0700 Subject: [PATCH] Drop Cheese flatpak from F39 ostree installer builds The others have all been rebased to F41, so we had to bump the Platform version to 41, but since Cheese is kinda dead these days, its flatpak hasn't been bumped, and that makes building the F39 ostree installer image fail. To work around this, sed it out of the pungi config. Signed-off-by: Adam Williamson --- templates-updates.fif.json | 1 - tests/_ostree_build.pm | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/templates-updates.fif.json b/templates-updates.fif.json index d11251e8..4f094987 100644 --- a/templates-updates.fif.json +++ b/templates-updates.fif.json @@ -353,7 +353,6 @@ }, "desktop_keyring": { "profiles": { - "fedora-updates-kde-x86_64-*-64bit": 5, "fedora-updates-workstation-x86_64-*-64bit": 5 } }, diff --git a/tests/_ostree_build.pm b/tests/_ostree_build.pm index 3266e6ae..97b63762 100644 --- a/tests/_ostree_build.pm +++ b/tests/_ostree_build.pm @@ -83,6 +83,8 @@ sub run { assert_script_run 'git clone https://pagure.io/pungi-fedora.git'; assert_script_run 'cd pungi-fedora/'; assert_script_run "git checkout ${branch}"; + # drop cheese flatpak on f39 as it has not been bumped to f41 base + assert_script_run 'sed -i -e "s,app/org.gnome.Cheese/[a-z_0-9]*/stable,,g" fedora.conf' if ($version eq "39"); assert_script_run 'curl --retry-delay 10 --max-time 30 --retry 5 -o ostree-parse-pungi.py https://pagure.io/fedora-qa/os-autoinst-distri-fedora/raw/main/f/ostree-parse-pungi.py', timeout => 180; my $loraxargs = script_output "python3 ostree-parse-pungi.py $lcsubv $arch";