Skip to content

Commit

Permalink
Revert "webui: pin down cockpit-* packages versions for gating purposes"
Browse files Browse the repository at this point in the history
We need to test the real distro, not what it was like 3 months ago. This
will pave the way for gating cockpit changes on anaconda's tests
(https://issues.redhat.com/browse/COCKPIT-1062).

But still keep pinning firefox from commit 546cacc. Add a bug
reference.

This reverts commit 72ef923.
  • Loading branch information
martinpitt committed Oct 6, 2023
1 parent 5b9a374 commit 0e88407
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
2 changes: 1 addition & 1 deletion ui/webui/test/build-rpms
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import sys
BOTS_DIR = os.path.realpath(f'{__file__}/../../bots')
sys.path.append(BOTS_DIR)

missing_packages = "dbus-glib"
missing_packages = "cockpit-ws cockpit-bridge dbus-glib"

from machine.machine_core import machine_virtual # NOQA: imported through parent.py

Expand Down
9 changes: 2 additions & 7 deletions ui/webui/test/prepare-updates-img
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@

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 latest firefox breaks our tests: https://bugzilla.redhat.com/show_bug.cgi?id=2242446
ANACONDA_WEBUI_DEPS_URLS='
https://kojipkgs.fedoraproject.org/packages/cockpit/298/1.fc39/x86_64/cockpit-ws-298-1.fc39.x86_64.rpm
https://kojipkgs.fedoraproject.org/packages/cockpit/298/1.fc39/x86_64/cockpit-bridge-298-1.fc39.x86_64.rpm
https://kojipkgs.fedoraproject.org/packages/firefox/118.0/1.fc40/x86_64/firefox-118.0-1.fc40.x86_64.rpm
'

Expand All @@ -28,11 +24,10 @@ 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
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 ${ANACONDA_WEBUI_DEPS_RPMS} ui/webui/tmp/rpms/dbus-glib-*.rpm
popd

0 comments on commit 0e88407

Please sign in to comment.