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