ci: move distro specific workarounds to the containerfiles

This change helps to keep the test itself more readable.

diff --git a/test/container/Dockerfile-debian b/test/container/Dockerfile-debian
index 86273d8f1a0a4f81a989159dd04fc567207ab1c1..ccc1274a9e2846a64c227b1344e321bc814b0ff3 100644 (file)
--- a/test/container/Dockerfile-debian
+++ b/test/container/Dockerfile-debian
@@ -98,3 +98,9 @@ RUN \
     zstd \
     && apt-get clean \
     && chmod a+r /boot/vmlinu*
+
+# workaround for kernel-install
+RUN \
+    KVERSION="$(cd /lib/modules && ls -1 | tail -1)" \
+    ; ! [ -e /usr/lib/modules/"$KVERSION"/vmlinuz ] && ln -sf /boot/vmlinuz /usr/lib/modules/"$KVERSION"/vmlinuz  \
+    ; ! [ -e /usr/lib/modules/"$KVERSION"/vmlinuz ] && ln -sf /boot/vmlinuz-"$KVERSION" /usr/lib/modules/"$KVERSION"/vmlinuz

diff --git a/test/container/Dockerfile-opensuse b/test/container/Dockerfile-opensuse
index 66b2d277ae43c0586de3a9747fe125a76707c953..e95da5b6c730ad4dbef8de6baca6d0fb73e8473d 100644 (file)
--- a/test/container/Dockerfile-opensuse
+++ b/test/container/Dockerfile-opensuse
@@ -53,3 +53,8 @@ RUN zypper --non-interactive install --no-recommends \
     util-linux-systemd \
     xorriso \
     && zypper --non-interactive dist-upgrade --no-recommends
+
+# workaround for openSUSE on arm64
+RUN \
+    KVERSION="$(cd /lib/modules && ls -1 | tail -1)" \
+    && if [ "$(arch)"="aarch64" ] && [ -e /usr/lib/modules/"$KVERSION"/Image ]; then ln -sf /usr/lib/modules/"$KVERSION"/Image /usr/lib/modules/"$KVERSION"/vmlinuz; fi

diff --git a/test/container/Dockerfile-void b/test/container/Dockerfile-void
index 0250da132731516e5387ee2506a1c9b6172d0c80..ecdfd0f41b2fd7d439b6648656dd89fe6e8b88f8 100644 (file)
--- a/test/container/Dockerfile-void
+++ b/test/container/Dockerfile-void
@@ -60,4 +60,5 @@ RUN xbps-install -Syu xbps && xbps-install -yu \
     ukify \
     xorriso \
     zfs \
-    && rm -rf /var/cache/xbps
+    && rm -rf /var/cache/xbps \
+    && rm -rf /usr/lib/firmware