From 461a6bdc7d25460062a771e267a0b390bfebb8c9 Mon Sep 17 00:00:00 2001 From: Katerina Koukiou Date: Fri, 28 Jul 2023 07:55:19 +0200 Subject: [PATCH] webui: update cockpit dependencies to the latest released in rawhide See the code inline for some cockpit-bridge bug workaround. The alternative would be to mark the test that this break as expected failure, but it's an important test we can't afford to lose at this pre-release timeframe. --- ui/webui/test/prepare-updates-img | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/webui/test/prepare-updates-img b/ui/webui/test/prepare-updates-img index b7dcb4bf597..ef6da7d7ee7 100755 --- a/ui/webui/test/prepare-updates-img +++ b/ui/webui/test/prepare-updates-img @@ -5,9 +5,13 @@ set -eu # FIXME boot.iso on rawhide does not currently contain the new cockpit dependencies # This will change once we include this changes upstream and start building boot.iso with the new dependencies # Then we can safely remove this workaround +# +# FIXME: Use fix from cockpit-project/cockpit#19147 +# Until that gets released, install cockpit-bridge from the PR COPR instead +# Original URL: https://kojipkgs.fedoraproject.org//packages/cockpit/297/1.fc39/x86_64/cockpit-bridge-297-1.fc39.x86_64.rpm ANACONDA_WEBUI_DEPS_URLS=' - https://kojipkgs.fedoraproject.org//packages/cockpit/293/1.fc39/x86_64/cockpit-ws-293-1.fc39.x86_64.rpm - https://kojipkgs.fedoraproject.org//packages/cockpit/293/1.fc39/x86_64/cockpit-bridge-293-1.fc39.x86_64.rpm + https://kojipkgs.fedoraproject.org//packages/cockpit/297/1.fc39/x86_64/cockpit-ws-297-1.fc39.x86_64.rpm + https://download.copr.fedorainfracloud.org/results/packit/cockpit-project-cockpit-19147/fedora-rawhide-x86_64/06219778-cockpit/cockpit-bridge-297-1.20230728101545089726.pr19147.3.g2e50bc074.fc39.x86_64.rpm ' mkdir -p tmp/extra-rpms