ci: gummiboot-stub no longer supports UEFI image with latest kernel

Remove ovmf from Alpine container to explicitly skip UEFI test.
Replace gummiboot with systemd-boot-efistub in the Void container.
Be consistent and remove sudo from all test containers.

diff --git a/test/container/Dockerfile-Ubuntu b/test/container/Dockerfile-Ubuntu
index 77a364c3c1d6376a0cb99bbb5f48bb7e248d1d87..054bc4ea70130a1bea0163b3668af6d7adaa8061 100644 (file)
--- a/test/container/Dockerfile-Ubuntu
+++ b/test/container/Dockerfile-Ubuntu
@@ -50,7 +50,6 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && \
     shellcheck \
     squashfs-tools \
     strace \
-    sudo \
     systemd \
     tcpdump \
     tgt \

diff --git a/test/container/Dockerfile-Void b/test/container/Dockerfile-Void
index 94f8318e603ce40b56b398628130355011d06795..6e42f4bb6050dd02eff9e9e02b8def267d26dca3 100644 (file)
--- a/test/container/Dockerfile-Void
+++ b/test/container/Dockerfile-Void
@@ -19,7 +19,6 @@ RUN xbps-install -Syu xbps && xbps-install -yu \
     eudev \
     git \
     gnupg \
-    gummiboot \
     iputils \
     kbd \
     libkmod-devel \
@@ -35,10 +34,8 @@ RUN xbps-install -Syu xbps && xbps-install -yu \
     openssh \
     parted \
     pigz \
-    procps-ng \
     qemu \
     squashfs-tools \
-    sudo \
-    util-linux \
+    systemd-boot-efistub \
     xz \
     && rm -rf /var/cache/xbps

diff --git a/test/container/Dockerfile-alpine b/test/container/Dockerfile-alpine
index b0b6387d864dbd3e6b0db9d1c556d3d4d674cf99..cf64e2100cfe5ef6ffb435db343d7042cf295cda 100644 (file)
--- a/test/container/Dockerfile-alpine
+++ b/test/container/Dockerfile-alpine
@@ -24,7 +24,6 @@ RUN apk add --no-cache \
     git \
     gpg \
     grep \
-    gummiboot \
     iputils \
     kbd \
     kmod-dev \
@@ -40,7 +39,6 @@ RUN apk add --no-cache \
     ntfs-3g-progs \
     open-iscsi \
     openssh \
-    ovmf \
     parted \
     partx \
     pigz \