From 31424dee5f85c33554f9556b0659844d7e276276 Mon Sep 17 00:00:00 2001
From: Jo Zzsi <jozzsicsataban@gmail.com>
Date: Thu, 29 Aug 2024 20:53:30 -0400
Subject: [PATCH] ci: add more packages to Debian and Ubuntu containers

Increase test coverage. Some of the newly added packages
are needed to to install some dracut modules and are already
installed for other CI containers.
---
 test/container/Dockerfile-Debian | 15 ++++++++++++++-
 test/container/Dockerfile-Ubuntu | 13 +++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/test/container/Dockerfile-Debian b/test/container/Dockerfile-Debian
index 7fe49358c..07298e0e2 100644
--- a/test/container/Dockerfile-Debian
+++ b/test/container/Dockerfile-Debian
@@ -15,6 +15,7 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && apt-get install -y -qq --
     bzip2 \
     ca-certificates \
     cargo \
+    cifs-utils \
     console-setup \
     cpio \
     cryptsetup \
@@ -23,15 +24,19 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && apt-get install -y -qq --
     docbook-xml \
     docbook-xsl \
     erofs-utils \
+    fcoe-utils \
     fdisk \
+    file \
     g++ \
     gawk \
     git \
+    gpg \
     iputils-arping \
     iputils-ping \
     isc-dhcp-client \
     isc-dhcp-server \
     iscsiuio \
+    jq \
     kmod \
     less \
     libkmod-dev \
@@ -45,24 +50,32 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && apt-get install -y -qq --
     network-manager \
     nfs-kernel-server \
     ntfs-3g \
+    nvme-cli \
     open-iscsi \
+    openssh-client \
     ovmf \
     parted \
+    pcscd \
     pigz \
+    plymouth \
     pkg-config \
     procps \
     qemu-kvm \
     rng-tools5 \
-    shellcheck \
     sbsigntool \
+    shellcheck \
     squashfs-tools \
     strace \
     systemd-boot-efi \
+    systemd-container \
     systemd-coredump \
+    systemd-resolved \
+    systemd-timesyncd \
     tcpdump \
     tgt \
     thin-provisioning-tools \
     tpm2-tools \
     vim \
     wget \
+    zstd \
     && apt-get clean
diff --git a/test/container/Dockerfile-Ubuntu b/test/container/Dockerfile-Ubuntu
index 6a0f9287d..6bd68ed86 100644
--- a/test/container/Dockerfile-Ubuntu
+++ b/test/container/Dockerfile-Ubuntu
@@ -12,6 +12,7 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && \
     bzip2 \
     ca-certificates \
     cargo \
+    cifs-utils \
     console-setup \
     cpio \
     cryptsetup \
@@ -21,15 +22,19 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && \
     docbook-xml \
     docbook-xsl \
     erofs-utils \
+    fcoe-utils \
     fdisk \
+    file \
     g++ \
     gawk \
     git \
+    gpg \
     iputils-arping \
     iputils-ping \
     isc-dhcp-client \
     isc-dhcp-server \
     iscsiuio \
+    jq \
     kmod \
     less \
     libdmraid-dev \
@@ -44,10 +49,14 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && \
     network-manager \
     nfs-kernel-server \
     ntfs-3g \
+    nvme-cli \
     open-iscsi \
+    openssh-client \
     ovmf \
     parted \
+    pcscd \
     pigz \
+    plymouth \
     pkg-config \
     procps \
     qemu-kvm \
@@ -57,7 +66,10 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && \
     squashfs-tools \
     strace \
     systemd-boot-efi \
+    systemd-container \
     systemd-coredump \
+    systemd-resolved \
+    systemd-timesyncd \
     systemd-ukify \
     tcpdump \
     tgt \
@@ -65,5 +77,6 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && \
     tpm2-tools \
     vim \
     wget \
+    zstd \
     && apt-get clean \
     && chmod a+r /boot/vmlinu*