ci: improve CI containers

Add pciutils for those containers that have the rdma out of tree dracut module
installed (pulled in by tgt package).

Add zfs and zfs out of tree dracut module as a preparation for zfs testing.

diff --git a/test/container/Dockerfile-arch b/test/container/Dockerfile-arch
index 29e25e35afbc7f2cb2d9e8aed322ee2676055854..e9381cf1df3743e08dac9af092ff70cb91c6b8f5 100644 (file)
--- a/test/container/Dockerfile-arch
+++ b/test/container/Dockerfile-arch
@@ -3,6 +3,7 @@
 # - mkinitcpio, mkosi
 # - sbsigntools
 # - qrencode (systemd-bsod)
+# - rdma out of tree dracut module
 
 # Not installed
 # - busybox (no need, tested elsewhere)
@@ -43,6 +44,7 @@ RUN pacman --noconfirm -Syu \
     nvme-cli \
     open-iscsi \
     parted \
+    pciutils \
     pkgconf \
     plymouth \
     qemu \

diff --git a/test/container/Dockerfile-fedora b/test/container/Dockerfile-fedora
index 249e9ddc6c6ad1206284bec5b970791dee32f6b0..8e7a02e1a9fd4300e007e726c348497104f6e56c 100644 (file)
--- a/test/container/Dockerfile-fedora
+++ b/test/container/Dockerfile-fedora
@@ -9,6 +9,7 @@
 # - openssh (ssh-client)
 # - rsyslog (syslog)
 # - libkcapi-hmaccalc (fido)
+# - nss-softokn out of tree dracut module
 
 ARG DISTRIBUTION=fedora
 ARG REGISTRY=registry.fedoraproject.org

diff --git a/test/container/Dockerfile-opensuse b/test/container/Dockerfile-opensuse
index 114de2c5037d14751010b63b3e31d48f6783fc90..14ceed8af16b54a29f794710e1d21a8ca71c9e94 100644 (file)
--- a/test/container/Dockerfile-opensuse
+++ b/test/container/Dockerfile-opensuse
@@ -1,6 +1,7 @@
 # Test coverage provided by this container:
 # - network-legacy
 # - hmaccalc (fido)
+# - rdma out of tree dracut module
 
 FROM registry.opensuse.org/opensuse/tumbleweed-dnf:latest
 
@@ -36,6 +37,7 @@ RUN dnf -y install --setopt=install_weak_deps=False \
     nfs-utils \
     open-iscsi \
     parted \
+    pciutils \
     procps \
     python3-pefile \
     qemu-kvm \

diff --git a/test/container/Dockerfile-void b/test/container/Dockerfile-void
index 805d29b70c1cf0b09cb747722c6e80ef6e87fa35..c777b212654872ae864be95c8025e1964fed5278 100644 (file)
--- a/test/container/Dockerfile-void
+++ b/test/container/Dockerfile-void
@@ -4,6 +4,7 @@
 # - eudev (instead of systemd-udev)
 # - elogind (instead of logind)
 # - uki (without systemd)
+# - zfs and zfs out of tree dracut module
 
 FROM ghcr.io/void-linux/void-glibc-full
 
@@ -45,4 +46,5 @@ RUN xbps-install -Syu xbps && xbps-install -yu \
     squashfs-tools \
     systemd-boot-efistub \
     ukify \
+    zfs \
     && rm -rf /var/cache/xbps