From c7a8b28da520327f067704997268ea3b0741d4b9 Mon Sep 17 00:00:00 2001 From: Allison Karlitskaya Date: Wed, 25 Feb 2026 08:51:01 +0100 Subject: [PATCH 1/3] test: Use beiboot on fedora-coreos Our current fedora-coreos test setup overlays the bridge and the plugins on the host and then additionally installs the various RPMs into a container. This is more or less what you needed to do in the pre-beiboot world, but the container on its own has been sufficient for quite some time. Let's get rid of the "host" rpm-ostree install component and just use the container straight-up, which is what we expect our users to be doing anyway. We keep the "podman container runlabel INSTALL" from the end of that script as a separate `--run-command` in `image-prepare`: we still want to test this stuff in privileged mode (vs. the rhel/ws-container scenarios which test an unprivileged container). --- test/image-prepare | 5 ++++- test/ostree.install | 12 ------------ 2 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 test/ostree.install diff --git a/test/image-prepare b/test/image-prepare index 7fbca311f94d..1e19e2233431 100755 --- a/test/image-prepare +++ b/test/image-prepare @@ -155,7 +155,10 @@ def build_install_ostree(dist_tars: list[str], image: str, *, verbose: bool, qui args += [ "--upload", os.path.join(BASE_DIR, "containers") + ":/var/tmp/", "--script", os.path.join(TEST_DIR, "ws-container.install"), - "--script", os.path.join(TEST_DIR, "ostree.install"), + "--run-command", ("rpm-ostree install -C --uninstall=cockpit-networkmanager --uninstall=cockpit-bridge " + "--uninstall=cockpit-system --uninstall=glib-networking python3"), + # run cockpit/ws once to generate certificate; avoids slow down on every start + "--run-command", "podman container runlabel INSTALL cockpit/ws", "--upload", os.path.join(BASE_DIR, "dist/playground") + ":/usr/local/share/cockpit/"] return args diff --git a/test/ostree.install b/test/ostree.install deleted file mode 100644 index 6fa787936512..000000000000 --- a/test/ostree.install +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# install/upgrade RPMs that apply to OSTree -set -eu - -cd /var/tmp/ - -# Note: cockpit-selinux would be desirable, but needs setroubleshoot-server which isn't installed -rpm-ostree install --cache-only cockpit-bridge-*.rpm \ - cockpit-networkmanager-*.rpm cockpit-system-*.rpm - -# run cockpit/ws once to generate certificate; avoids slow down on every start -podman container runlabel INSTALL cockpit/ws From dd9adcb0bbe4d085c9b32ad2d62a9fdbc44b27a8 Mon Sep 17 00:00:00 2001 From: Allison Karlitskaya Date: Wed, 25 Feb 2026 19:53:52 +0100 Subject: [PATCH 2/3] i said yolo --- test/common/testlib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/common/testlib.py b/test/common/testlib.py index 6c1c608a49bd..f01ead1d862a 100644 --- a/test/common/testlib.py +++ b/test/common/testlib.py @@ -2664,7 +2664,7 @@ def skipWsContainer(reason: str) -> Callable[[_FT], _FT]: def skipBeiboot(reason: str) -> Callable[[_FT], _FT]: """Decorator for skipping a test with cockpit/ws in beiboot mode""" - if isBeibootLogin(): + if testvm.DEFAULT_IMAGE in OSTREE_IMAGES or isBeibootLogin(): return unittest.skip(f"{testvm.DEFAULT_IMAGE}: {reason}") return lambda testEntity: testEntity From 5dade5d17e5d24f4b3b33bbb8da0ff30e465449f Mon Sep 17 00:00:00 2001 From: Allison Karlitskaya Date: Wed, 25 Feb 2026 22:13:14 +0100 Subject: [PATCH 3/3] moar --- test/common/testlib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/common/testlib.py b/test/common/testlib.py index f01ead1d862a..9dd6eee84bc4 100644 --- a/test/common/testlib.py +++ b/test/common/testlib.py @@ -2652,7 +2652,7 @@ def skipOstree(reason: str) -> Callable[[_FT], _FT]: def isBeibootLogin() -> bool: - return "ws-container" in os.getenv("TEST_SCENARIO", "") + return True def skipWsContainer(reason: str) -> Callable[[_FT], _FT]: