ci(fedora): use Debian, Arch, Gentoo to test systemd-networkd

This is in an effort to simplify the CI and minimize
the difference between CentOS and Fedora testing.

While Fedora supports systemd-networkd, CentOS does not and
Debian, Arch and Gentoo already provides enought test coverage
for the Dracut CI.

diff --git a/test/container/Dockerfile-alpine b/test/container/Dockerfile-alpine
index 8d07985a1f96ebb21a7dcb37edff66b56c048e52..444a74eca1025486fd547effe4a96e2ebfe74bf2 100644 (file)
--- a/test/container/Dockerfile-alpine
+++ b/test/container/Dockerfile-alpine
@@ -7,6 +7,7 @@
 # - busybox default shell (no dash installed)
 # - gzip compression
 # - dbus-daemon
+# - network: none
 
 # Not installed
 # - cargo (to increase coverage)
@@ -30,7 +31,6 @@ RUN apk add --no-cache \
     dracut-tests \
     file \
     gcc \
-    iputils \
     kmod \
     kmod-dev \
     linux-virt \
@@ -48,7 +48,6 @@ if [ "$DISTRIBUTION" = "alpine:edge" ] ; then \
     device-mapper \
     elogind \
     gpg \
-    iputils \
     jq \
     kbd \
     keyutils \

diff --git a/test/container/Dockerfile-arch b/test/container/Dockerfile-arch
index 7f103317b8d71290d92c26d75d118039def43b17..467de711e2cc52888b8a6dc6e862d3aaef228a67 100644 (file)
--- a/test/container/Dockerfile-arch
+++ b/test/container/Dockerfile-arch
@@ -6,6 +6,7 @@
 # - rdma out of tree dracut module
 # - both dbus-daemon and dbus-broker
 # - dmraid (not activly maintained)
+# - network: network-legacy, network-manager, systemd-networkd
 
 # Not installed
 # - busybox (no need, tested elsewhere)

diff --git a/test/container/Dockerfile-debian b/test/container/Dockerfile-debian
index cbd216525c4eca7aface4281f12107b619f72953..86273d8f1a0a4f81a989159dd04fc567207ab1c1 100644 (file)
--- a/test/container/Dockerfile-debian
+++ b/test/container/Dockerfile-debian
@@ -5,6 +5,7 @@
 # - zstd compression
 # - verbose logging for tests
 # - dbus-daemon
+# - network: network-legacy, network-manager, systemd-networkd
 
 # Not installed
 # - iscsiuio, open-iscsi (not yet working with dracut, https://bugs.launchpad.net/ubuntu/+source/open-iscsi/+bug/2072484)

diff --git a/test/container/Dockerfile-fedora b/test/container/Dockerfile-fedora
index ab934aa60102de43ee169ed72025d7008a6d5d88..6031115b98d8a1a18914e7f71b78b8956328175a 100644 (file)
--- a/test/container/Dockerfile-fedora
+++ b/test/container/Dockerfile-fedora
@@ -14,6 +14,7 @@
 # - fips
 # - ignition
 # - dbus-broker
+# - network: network-legacy, network-manager
 
 ARG DISTRIBUTION=fedora
 ARG REGISTRY=registry.fedoraproject.org
@@ -38,7 +39,6 @@ else \
     nbd \
     qemu \
     scsi-target-utils \
-    systemd-networkd \
 ; fi
 
 RUN dnf -y install --setopt=install_weak_deps=False \

diff --git a/test/container/Dockerfile-gentoo b/test/container/Dockerfile-gentoo
index 8bedcb8b886b0f99a22908c70fa9485459c7c5a1..35350972068f94d79a4c46b046b281cda374a516 100644 (file)
--- a/test/container/Dockerfile-gentoo
+++ b/test/container/Dockerfile-gentoo
@@ -3,6 +3,7 @@
 # - systemd-networkd
 # - bash
 # - dbus-daemon
+# - network: network-legacy, systemd-networkd
 
 # Not installed
 # - NetworkManager (to increase coverage)

diff --git a/test/container/Dockerfile-opensuse b/test/container/Dockerfile-opensuse
index f4c02f98dc1c98636de1e169682fa0a9b5199a3e..b28edc142c22b7d5faf2815af6bb5fea1e37361e 100644 (file)
--- a/test/container/Dockerfile-opensuse
+++ b/test/container/Dockerfile-opensuse
@@ -6,6 +6,7 @@
 # - hmaccalc (fido)
 # - rdma out of tree dracut module
 # - dbus-broker
+# - network: network-legacy, network-manager
 
 FROM registry.opensuse.org/opensuse/tumbleweed:latest
 

diff --git a/test/container/Dockerfile-void b/test/container/Dockerfile-void
index 1c8ab40aaf352535cc9121877782382e14d237c5..0250da132731516e5387ee2506a1c9b6172d0c80 100644 (file)
--- a/test/container/Dockerfile-void
+++ b/test/container/Dockerfile-void
@@ -9,6 +9,7 @@
 # - gzip compression
 # - clang
 # - dbus-daemon
+# - network: network-legacy, network-manager
 
 # Not installed
 # - kernel-install is not available