Skip to content

Commit

Permalink
test: Consolidate offline user podman hack
Browse files Browse the repository at this point in the history
Re-drop the "run VM online" hack for Fedora CoreOS. It's enough to apply
our "add dummy iface" hack like we do on non-CoreOS images -- we just
forgot to pass our `VM_CUSTOMIZE_FLAGS` there.

This regression has reached CentOS 9 Stream now, so this workaround is
necessary there as well.

As the original upstream bug is closed, add a reference to the Fedora
bugzilla.
  • Loading branch information
martinpitt authored and jelly committed May 28, 2024
1 parent 7a41ed9 commit 9c3a93f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ TAR_ARGS = --sort=name --mtime "@$(shell git show --no-patch --format='%at')" --

VM_CUSTOMIZE_FLAGS =

# HACK: https://github.com/containers/podman/issues/21896
# HACK: https://github.com/containers/podman/issues/21896 and https://bugzilla.redhat.com/show_bug.cgi?id=2277954
VM_CUSTOMIZE_FLAGS += --run-command 'nmcli con add type dummy con-name fake ifname fake0 ip4 1.2.3.4/24 gw4 1.2.3.1 >&2'

# the following scenarios need network access
Expand Down Expand Up @@ -171,7 +171,8 @@ rpm: $(TARFILE)
$(VM_IMAGE): $(TARFILE) packaging/debian/rules packaging/debian/control packaging/arch/PKGBUILD bots
# HACK for ostree images: skip the rpm build/install
if [ "$${TEST_OS%coreos}" != "$$TEST_OS" ] || [ "$${TEST_OS%bootc}" != "$$TEST_OS" ] || [ "$$TEST_OS" = "rhel4edge" ]; then \
bots/image-customize --verbose --fresh --no-network --run-command 'mkdir -p /usr/local/share/cockpit' \
bots/image-customize --verbose --fresh --no-network $(VM_CUSTOMIZE_FLAGS) \
--run-command 'mkdir -p /usr/local/share/cockpit' \
--upload dist/:/usr/local/share/cockpit/podman \
--script $(CURDIR)/test/vm.install $(TEST_OS); \
else \
Expand Down
5 changes: 0 additions & 5 deletions test/run
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ if [ "$TEST_SCENARIO" == "devel" ]; then
export TEST_COVERAGE=yes
fi

# Workaround broken podman pasta on Fedora-CoreOS https://bugzilla.redhat.com/show_bug.cgi?id=2277954
if [ "$TEST_OS" == "fedora-coreos" ]; then
export RUN_TESTS_OPTIONS="${RUN_TESTS_OPTIONS} --enable-network"
fi

make codecheck
make check
make po/podman.pot

0 comments on commit 9c3a93f

Please sign in to comment.