From: Jo Zzsi <jozzsicsataban@gmail.com>
Date: Fri, 20 Sep 2024 01:26:38 +0000 (-0400)
Subject: ci: add swtpm for TPM emulation
X-Git-Tag: 104~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa3679f627b5dcbd076c009238c02566db6941a0;p=thirdparty%2Fdracut-ng.git

ci: add swtpm for TPM emulation
---

diff --git a/test/container/Dockerfile-alpine b/test/container/Dockerfile-alpine
index 4074de4f4..91759c37e 100644
--- a/test/container/Dockerfile-alpine
+++ b/test/container/Dockerfile-alpine
@@ -29,8 +29,8 @@ RUN apk add --no-cache \
     e2fsprogs \
     erofs-utils \
     eudev \
-    findmnt \
     file \
+    findmnt \
     f2fs-tools \
     gawk \
     git \
@@ -40,9 +40,9 @@ RUN apk add --no-cache \
     jfsutils \
     jq \
     kbd \
+    keyutils \
     kmod \
     kmod-dev \
-    keyutils \
     libcap-utils \
     linux-virt \
     losetup \
@@ -70,6 +70,7 @@ RUN apk add --no-cache \
     sfdisk \
     squashfs-tools \
     sudo \
+    swtpm \
     util-linux-misc \
     xfsprogs \
     xz
diff --git a/test/container/Dockerfile-arch b/test/container/Dockerfile-arch
index 5f88b9d53..6dd139f8a 100644
--- a/test/container/Dockerfile-arch
+++ b/test/container/Dockerfile-arch
@@ -50,10 +50,11 @@ RUN pacman --noconfirm -Syu \
     shfmt \
     squashfs-tools \
     strace \
+    swtpm \
     systemd-ukify \
     tcpdump \
     tgt \
     tpm2-tools \
-    xfsprogs \
     vi \
+    xfsprogs \
     && yes | pacman -Scc
diff --git a/test/container/Dockerfile-debian b/test/container/Dockerfile-debian
index 3402e51b3..7346cb268 100644
--- a/test/container/Dockerfile-debian
+++ b/test/container/Dockerfile-debian
@@ -24,10 +24,10 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && apt-get install -y -qq --
     docbook-xml \
     docbook-xsl \
     erofs-utils \
+    f2fs-tools \
     fcoe-utils \
     fdisk \
     file \
-    f2fs-tools \
     g++ \
     gawk \
     git \
@@ -59,8 +59,8 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && apt-get install -y -qq --
     parted \
     pcscd \
     pigz \
-    plymouth \
     pkg-config \
+    plymouth \
     procps \
     qemu-kvm \
     rng-tools5 \
@@ -68,6 +68,7 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && apt-get install -y -qq --
     shellcheck \
     squashfs-tools \
     strace \
+    swtpm \
     systemd-boot-efi \
     systemd-container \
     systemd-coredump \
diff --git a/test/container/Dockerfile-fedora b/test/container/Dockerfile-fedora
index c3a96ec0a..9977a51e9 100644
--- a/test/container/Dockerfile-fedora
+++ b/test/container/Dockerfile-fedora
@@ -62,6 +62,7 @@ RUN dnf -y install --setopt=install_weak_deps=False \
     shfmt \
     squashfs-tools \
     strace \
+    swtpm \
     systemd-boot-unsigned \
     systemd-networkd \
     systemd-resolved \
diff --git a/test/container/Dockerfile-gentoo b/test/container/Dockerfile-gentoo
index 4191e1a7e..d9850f6ca 100644
--- a/test/container/Dockerfile-gentoo
+++ b/test/container/Dockerfile-gentoo
@@ -25,17 +25,18 @@ RUN emerge --quiet --update --deep --newuse --autounmask-continue=y --with-bdeps
 
 RUN emerge --quiet --deep --autounmask-continue=y --with-bdeps=n --noreplace \
     app-admin/rsyslog \
+    app-alternatives/bc \
     app-alternatives/cpio \
-	app-alternatives/bc \
     app-arch/cpio \
-    app-crypt/tpm2-tools \
     app-crypt/sbsigntools \
+    app-crypt/swtpm \
+    app-crypt/tpm2-tools \
     app-emulation/qemu \
     app-misc/jq \
     app-portage/gentoolkit \
     app-shells/dash \
-    dev-lang/rust-bin \
     dev-lang/perl \
+    dev-lang/rust-bin \
     dev-libs/openssl \
     net-fs/cifs-utils \
     net-fs/nfs-utils \
@@ -64,8 +65,8 @@ RUN emerge --quiet --deep --autounmask-continue=y --with-bdeps=n --noreplace \
     sys-fs/squashfs-tools \
     sys-fs/xfsprogs \
     sys-kernel/gentoo-kernel-bin \
-    sys-libs/libxcrypt \
     sys-libs/glibc \
+    sys-libs/libxcrypt \
     virtual/libelf \
     virtual/pkgconfig \
     && rm -rf /var/cache/* /usr/share/doc/* /usr/share/man/*
diff --git a/test/container/Dockerfile-opensuse b/test/container/Dockerfile-opensuse
index 792e21b04..3ba823a54 100644
--- a/test/container/Dockerfile-opensuse
+++ b/test/container/Dockerfile-opensuse
@@ -47,6 +47,7 @@ RUN dnf -y install --setopt=install_weak_deps=False \
     shfmt \
     squashfs \
     strace \
+    swtpm \
     systemd-boot \
     systemd-experimental \
     tar \
diff --git a/test/container/Dockerfile-ubuntu b/test/container/Dockerfile-ubuntu
index 5a7da1718..d8796a08a 100644
--- a/test/container/Dockerfile-ubuntu
+++ b/test/container/Dockerfile-ubuntu
@@ -25,10 +25,10 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && \
     docbook-xml \
     docbook-xsl \
     erofs-utils \
+    f2fs-tools \
     fcoe-utils \
     fdisk \
     file \
-    f2fs-tools \
     g++ \
     gawk \
     git \
@@ -61,8 +61,8 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && \
     parted \
     pcscd \
     pigz \
-    plymouth-themes \
     pkg-config \
+    plymouth-themes \
     procps \
     qemu-kvm \
     rng-tools5 \
@@ -70,6 +70,7 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && \
     shellcheck \
     squashfs-tools \
     strace \
+    swtpm \
     systemd-boot-efi \
     systemd-container \
     systemd-coredump \
diff --git a/test/container/Dockerfile-void b/test/container/Dockerfile-void
index ed6379b3d..17104a264 100644
--- a/test/container/Dockerfile-void
+++ b/test/container/Dockerfile-void
@@ -57,6 +57,7 @@ RUN xbps-install -Syu xbps && xbps-install -yu \
     shfmt \
     squashfs-tools \
     strace \
+    swtpm \
     systemd-boot-efistub \
     tcpdump \
     tgt \