From 754e9d6fa8d5fb6dac3c641c4986b4b0b33a6e87 Mon Sep 17 00:00:00 2001
From: Katerina Koukiou <kkoukiou@redhat.com>
Date: Fri, 7 Jul 2023 08:41:47 +0200
Subject: [PATCH] Revert "webui: pin down cockpit-* packages versions for
 gating purposes"

This reverts commit 72ef9238f1a7839f901d12bb42437bd4a85987ab.
---
 ui/webui/test/build-rpms          |  2 +-
 ui/webui/test/prepare-updates-img | 22 ++--------------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/ui/webui/test/build-rpms b/ui/webui/test/build-rpms
index 412e892e140c..148ac584d7c3 100755
--- a/ui/webui/test/build-rpms
+++ b/ui/webui/test/build-rpms
@@ -11,7 +11,7 @@ import sys
 BOTS_DIR = os.path.realpath(f'{__file__}/../../bots')
 sys.path.append(BOTS_DIR)
 
-missing_packages = "firefox dbus-glib"
+missing_packages = "cockpit-ws cockpit-bridge firefox dbus-glib"
 
 from machine.machine_core import machine_virtual  # NOQA: imported through parent.py
 
diff --git a/ui/webui/test/prepare-updates-img b/ui/webui/test/prepare-updates-img
index cd1bf12f1fda..b6a141e63b89 100755
--- a/ui/webui/test/prepare-updates-img
+++ b/ui/webui/test/prepare-updates-img
@@ -2,23 +2,6 @@
 
 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
-ANACONDA_WEBUI_DEPS_URLS='
-    https://kojipkgs.fedoraproject.org//packages/cockpit/294/1.fc39/x86_64/cockpit-ws-294-1.fc39.x86_64.rpm
-    https://kojipkgs.fedoraproject.org//packages/cockpit/294/1.fc39/x86_64/cockpit-bridge-294-1.fc39.x86_64.rpm
-'
-
-mkdir -p tmp/extra-rpms
-pushd tmp/extra-rpms
-for url in $ANACONDA_WEBUI_DEPS_URLS; do
-    test -e "$(basename "${url}")" || curl -LO "$url"
-done
-# shellcheck disable=SC2086,SC2046
-ANACONDA_WEBUI_DEPS_RPMS="$(realpath $(basename -a ${ANACONDA_WEBUI_DEPS_URLS}))"
-popd
-
 # switch to root of the repository
 pushd ../..
 # remove old rpms and build new srpm
@@ -26,12 +9,11 @@ rm -rf ../../result/build
 make srpm
 popd
 
-# build the anaconda srpm (and result RPMs go in `tmp/rpms`) && download anaconda-webui missing dependencies
-# cockpit RPMs are hardcoded above for gating purposes
+# build the anaconda srpm (and result RPMs go in `tmp/rpms`) && download cockpit RPMs
 test/build-rpms -v ../../result/build/00-srpm-build/anaconda-*.src.rpm
 
 # makeupdates must be run from the top level of the anaconda source tree
 pushd ../../
 # shellcheck disable=SC2086,SC2046
-scripts/makeupdates --add ui/webui/tmp/rpms/anaconda-*.rpm ${ANACONDA_WEBUI_DEPS_RPMS} ui/webui/tmp/rpms/firefox-*.rpm ui/webui/tmp/rpms/dbus-glib-*.rpm
+scripts/makeupdates --add ui/webui/tmp/rpms/anaconda-*.rpm ui/webui/tmp/rpms/cockpit-*.rpm ui/webui/tmp/rpms/firefox-*.rpm ui/webui/tmp/rpms/dbus-glib-*.rpm
 popd