Skip to content

Commit 1ea14f5

Browse files
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).
1 parent 0c10eca commit 1ea14f5

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

test/image-prepare

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def build_install_ostree(dist_tars: list[str], image: str, *, verbose: bool, qui
155155
args += [
156156
"--upload", os.path.join(BASE_DIR, "containers") + ":/var/tmp/",
157157
"--script", os.path.join(TEST_DIR, "ws-container.install"),
158-
"--script", os.path.join(TEST_DIR, "ostree.install"),
158+
"--run-command", "podman container runlabel INSTALL cockpit/ws",
159159
"--upload", os.path.join(BASE_DIR, "dist/playground") + ":/usr/local/share/cockpit/"]
160160
return args
161161

test/ostree.install

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)