Skip to content

Commit 8d49f40

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" install component and just use the container straight-up, which is what we expect our users to be doing anyway.
1 parent 0c10eca commit 8d49f40

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

test/image-prepare

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ 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"),
159158
"--upload", os.path.join(BASE_DIR, "dist/playground") + ":/usr/local/share/cockpit/"]
160159
return args
161160

test/ostree.install

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

test/ws-container.install

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,6 @@ podman rm -f build-cockpit
4343
# move original quay.io image away, to make sure that our tests use the updated one
4444
podman tag quay.io/cockpit/ws:latest quay.io/cockpit/original-ws:released
4545
podman rmi quay.io/cockpit/ws:latest
46+
47+
# run cockpit/ws once to generate certificate; avoids slow down on every start
48+
podman container runlabel INSTALL cockpit/ws

0 commit comments

Comments
 (0)