Skip to content

Commit 53c7ab3

Browse files
committed
test: Remove cockpit/ws container on non-OSTree images
In cockpit-project/bots#7046 we want to pre-install the cockpit/ws container to the fedora-40 image (and in the future, whichever Fedora version the container is based on). This "breaks" pixel tests due to the additional container image, so remove it for anything except OSTree images. We don't just want to include it in the pixel tests, as the container's base image and pixel reference OS move independently.
1 parent e37e828 commit 53c7ab3

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

test/vm.install

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ fi
3737
# Since 4.0 podman now ships the pause image
3838
podman images --format '{{.Repository}}:{{.Tag}}' | grep -Ev 'localhost/test-|pause|cockpit/ws' | xargs -r podman rmi -f
3939

40+
# clean up cockpit/ws on Fedora images, as it "breaks" pixel tests; it's only relevant for OSTree images
41+
[ -n "${OSTREE_VERSION:-}" ] || podman rmi -f quay.io/cockpit/ws || true
42+
4043
# tests reset podman, save the images
4144
mkdir -p /var/lib/test-images
4245
for img in $(podman images --format '{{.Repository}}:{{.Tag}}'); do

0 commit comments

Comments
 (0)