ci(azurelinux): remove some binaries to workaround test failures

TEST-41 is failing on azurelinux due to issues
with multipath and systemd-portabled dracut modules.

Remove binaries to prevent multipath and systemd-portabled
dracut modules to be tested until the issues are resolved
with the azurelinux container.

diff --git a/test/TEST-41-FULL-SYSTEMD/test.sh b/test/TEST-41-FULL-SYSTEMD/test.sh
index de4c536b83d76c9a41004331497e39d6a3546e66..1dfdb8b0792ee62b3c55bd698f29b8a1209ed516 100755 (executable)
--- a/test/TEST-41-FULL-SYSTEMD/test.sh
+++ b/test/TEST-41-FULL-SYSTEMD/test.sh
@@ -71,7 +71,7 @@ test_setup() {
     trap "$(shopt -p globstar)" RETURN
     shopt -q -s globstar
 
-    local dracut_modules="resume systemd-udevd systemd-journald systemd-tmpfiles systemd-cryptsetup systemd-emergency systemd-ac-power systemd-coredump systemd-creds systemd-integritysetup systemd-ldconfig systemd-pstore systemd-repart systemd-sysext systemd-veritysetup systemd-hostnamed systemd-portabled systemd-timedated"
+    local dracut_modules="resume systemd-udevd systemd-journald systemd-tmpfiles systemd-cryptsetup systemd-emergency systemd-ac-power systemd-coredump systemd-creds systemd-integritysetup systemd-ldconfig systemd-pstore systemd-repart systemd-sysext systemd-veritysetup systemd-hostnamed systemd-timedated"
 
     # TODO - this workaround should not be needed and should be removed
     if [ -f /usr/bin/dbus-broker ]; then
@@ -93,6 +93,9 @@ test_setup() {
     if [ -f /usr/lib/systemd/systemd-pcrextend ]; then
         dracut_modules="$dracut_modules systemd-pcrphase"
     fi
+    if [ -f /usr/lib/systemd/systemd-portabled ]; then
+        dracut_modules="$dracut_modules systemd-portabled"
+    fi
 
     # Create what will eventually be our root filesystem onto an overlay
     "$DRACUT" -N --keep --tmpdir "$TESTDIR" \

diff --git a/test/container/Dockerfile-azurelinux b/test/container/Dockerfile-azurelinux
index b3b5203c16855ddb1e8d7a77e3d5fbc60a29fd7b..7ef9be778fbf2f135f8d459c057ca2e0d2ab8ae7 100644 (file)
--- a/test/container/Dockerfile-azurelinux
+++ b/test/container/Dockerfile-azurelinux
@@ -18,7 +18,6 @@ RUN tdnf -y install --setopt=install_weak_deps=False \
     chrony \
     cifs-utils \
     cryptsetup \
-    device-mapper-multipath \
     dhcpcd \
     e2fsprogs \
     fuse3 \
@@ -55,3 +54,7 @@ RUN tdnf -y install --setopt=install_weak_deps=False \
     xfsprogs \
     xorriso \
     && tdnf clean all
+
+# disable systemd-portabled - it is optional and allows to pass the CI
+RUN \
+    rm -rf /usr/bin/portablectl /usr/lib/systemd/systemd-portabled