From 4c90b4a07d2b3f935f5ea8b4607a77f12b66d855 Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Tue, 10 Dec 2019 10:34:16 -0500 Subject: [PATCH 27/45] test(check-container): add support for centos8 stream (cherry picked from commit 47be9c516344243750b68d570c69e7a5c4022805) (cherry picked from commit fdf7eb8c8d7b82e68c6488e4755568fd0a5442a1) --- src/tests/Makefile.am | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 6be678146b99..b7556b30ecc8 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -48,7 +48,7 @@ $(TESTSUITE) $(TESTSUITE_INTEGRATION): $(TESTSUITE_FILES) $(srcdir)/package.m4 $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at mv $@.tmp $@ -CONTAINER_TARGETS = check-container-debian-sid check-container-fedora-rawhide +CONTAINER_TARGETS = check-container-debian-sid check-container-fedora-rawhide check-container-centos8-stream check-container-debian-sid-image: check-container-%-image: (cd $(abs_top_srcdir) && { \ @@ -76,11 +76,28 @@ check-container-fedora-rawhide-image: check-container-%-image: echo "COPY . /tmp/firewalld"; \ } | $(PODMAN) build -t firewalld-testsuite-$* -f - . ) +check-container-centos8-stream-image: check-container-%-image: + (cd $(abs_top_srcdir) && { \ + echo "FROM centos:8" && \ + echo "RUN dnf -y makecache" && \ + echo "RUN dnf -y install centos-release-stream" && \ + echo "RUN dnf -y install autoconf automake conntrack-tools desktop-file-utils \ + docbook-style-xsl file gettext glib2-devel intltool ipset \ + iptables iptables-ebtables nftables libtool libxml2 \ + libxslt make nftables python3-nftables python3-slip-dbus \ + python3-gobject-base diffutils procps-ng iproute which dbus-daemon \ + NetworkManager" && \ + echo "COPY . /tmp/firewalld"; \ + } | $(PODMAN) build -t firewalld-testsuite-$* -f - . ) + +check-container-debian-sid: PYTHON=/usr/bin/python3 +check-container-fedora-rawhide: PYTHON=/usr/bin/python3 +check-container-centos8-stream: PYTHON=/usr/libexec/platform-python $(CONTAINER_TARGETS): check-container-%: check-container-%-image $(PODMAN) run -i --rm --privileged firewalld-testsuite-$* bash -c " \ cd /tmp/firewalld && \ ./autogen.sh && \ - ./configure PYTHON=/usr/bin/python3 && \ + ./configure PYTHON=\"${PYTHON}\" && \ make && \ { make -C src/tests check-local TESTSUITEFLAGS=\"$(TESTSUITEFLAGS)\" || \ make -C src/tests check-local TESTSUITEFLAGS=\"--recheck --errexit --verbose\" ; } && \ -- 2.27.0