Skip to content

Commit

Permalink
test: Remove cockpit/ws container on non-OSTree images
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
martinpitt committed Oct 29, 2024
1 parent e37e828 commit 53c7ab3
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions test/vm.install
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ fi
# Since 4.0 podman now ships the pause image
podman images --format '{{.Repository}}:{{.Tag}}' | grep -Ev 'localhost/test-|pause|cockpit/ws' | xargs -r podman rmi -f

# clean up cockpit/ws on Fedora images, as it "breaks" pixel tests; it's only relevant for OSTree images
[ -n "${OSTREE_VERSION:-}" ] || podman rmi -f quay.io/cockpit/ws || true

# tests reset podman, save the images
mkdir -p /var/lib/test-images
for img in $(podman images --format '{{.Repository}}:{{.Tag}}'); do
Expand Down

0 comments on commit 53c7ab3

Please sign in to comment.