ci(fedora): switch Fedora to dbus-broker

switch Fedora to dbus-broker and document the status of dbus-daemon
and dbus-broker for each CI container.

In general if the distribution supports a dbus metapackage, try
to honor the distribution default choice.

diff --git a/test/container/Dockerfile-alpine b/test/container/Dockerfile-alpine
index 0b831fbad944cd95cc6de5ffcfd210a91e22e62d..f33e7595189f42a9a7bb056704cddfd1d6ea1076 100644 (file)
--- a/test/container/Dockerfile-alpine
+++ b/test/container/Dockerfile-alpine
@@ -6,7 +6,7 @@
 # - elogind (instead of logind)
 # - busybox default shell (no dash installed)
 # - gzip compression
-# - clang
+# - dbus-daemon
 
 # Not installed
 # - cargo (to increase coverage)

diff --git a/test/container/Dockerfile-arch b/test/container/Dockerfile-arch
index b6b06f0f3f9a4d9dc8763cebacc2dd80511691eb..1d4bc433104f083f8ad45d3b5eab9935c505ee65 100644 (file)
--- a/test/container/Dockerfile-arch
+++ b/test/container/Dockerfile-arch
@@ -4,6 +4,7 @@
 # - sbsigntools
 # - qrencode (systemd-bsod)
 # - rdma out of tree dracut module
+# - both dbus-daemon and dbus-broker
 
 # Not installed
 # - busybox (no need, tested elsewhere)

diff --git a/test/container/Dockerfile-debian b/test/container/Dockerfile-debian
index 54b6cec99970552bb455cd073fd47d8f95a7b9c3..e8ff6aac492c68db28d99c1fa3278da836be6aea 100644 (file)
--- a/test/container/Dockerfile-debian
+++ b/test/container/Dockerfile-debian
@@ -4,6 +4,7 @@
 # - mawk (instead of gawk)
 # - zstd compression
 # - verbose logging for tests
+# - dbus-daemon
 
 # Not installed
 # - dmraid (no longer maintained, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1056944)

diff --git a/test/container/Dockerfile-fedora b/test/container/Dockerfile-fedora
index 3605e9885605621a9aaaee74b8bdb34aec5613e5..de8c8aeccd0048eb4f9e81517b540c7e37aacd4d 100644 (file)
--- a/test/container/Dockerfile-fedora
+++ b/test/container/Dockerfile-fedora
@@ -13,6 +13,7 @@
 # - nss-softokn, kdumpbase out of tree dracut modules
 # - fips
 # - ignition
+# - dbus-broker
 
 ARG DISTRIBUTION=fedora
 ARG REGISTRY=registry.fedoraproject.org
@@ -50,7 +51,6 @@ RUN dnf -y install --setopt=install_weak_deps=False \
     cifs-utils \
     cryptsetup \
     crypto-policies-scripts \
-    dbus-daemon \
     device-mapper-multipath \
     dracut-live \
     e2fsprogs \

diff --git a/test/container/Dockerfile-gentoo b/test/container/Dockerfile-gentoo
index 78f8a5298c48fa9d88ffdfba1b7407b480caf982..11609859c0fed88fe194cc18f1aeef509ef2211a 100644 (file)
--- a/test/container/Dockerfile-gentoo
+++ b/test/container/Dockerfile-gentoo
@@ -2,6 +2,7 @@
 # - glibc/systemd or musl/openrc
 # - systemd-networkd
 # - bash
+# - dbus-daemon
 
 # Not installed
 # - NetworkManager (to increase coverage)

diff --git a/test/container/Dockerfile-opensuse b/test/container/Dockerfile-opensuse
index 1433d32e0527af0a78dbe2078cd8180ff71c5130..3e774e3918388d044c180ae351a5ec0009f05ee4 100644 (file)
--- a/test/container/Dockerfile-opensuse
+++ b/test/container/Dockerfile-opensuse
@@ -3,6 +3,7 @@
 # - mkosi-initrd
 # - hmaccalc (fido)
 # - rdma out of tree dracut module
+# - dbus-broker
 
 FROM registry.opensuse.org/opensuse/tumbleweed:latest
 
@@ -13,7 +14,6 @@ RUN zypper --non-interactive install --no-recommends \
     btrfsprogs \
     cargo \
     cryptsetup \
-    dbus-broker \
     dhcp-client \
     dhcp-server \
     distribution-gpg-keys \

diff --git a/test/container/Dockerfile-void b/test/container/Dockerfile-void
index 2932fbf345243c488c43b825302528dac4c1be55..35d1a2764e02e78c427a2b86ce330fe19083705a 100644 (file)
--- a/test/container/Dockerfile-void
+++ b/test/container/Dockerfile-void
@@ -7,6 +7,7 @@
 # - zfs and zfs out of tree dracut module
 # - gzip compression
 # - clang
+# - dbus-daemon
 
 FROM ghcr.io/void-linux/void-glibc-full