tests/lcitool: add swtpm to the package list

We need this to test some TPM stuff. Reviewed-by: "Daniel P. Berrangé" <berrange@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20231009164104.369749-4-alex.bennee@linaro.org>
2024-07-21 10:24:33 +00:00 · 2023-10-09 17:40:42 +01:00 · 2023-10-09 17:40:42 +01:00 · 3e3df0d84f
parent a956ea5b34
commit 3e3df0d84f
16 changed files with 16 additions and 2 deletions
--- a/.gitlab-ci.d/cirrus/macos-12.vars
+++ b/.gitlab-ci.d/cirrus/macos-12.vars
@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake'
 NINJA='/opt/homebrew/bin/ninja'
 PACKAGING_COMMAND='brew'
 PIP3='/opt/homebrew/bin/pip3'
-PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol tesseract usbredir vde vte3 xorriso zlib zstd'
+PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 xorriso zlib zstd'
 PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme tomli'
 PYTHON='/opt/homebrew/bin/python3'
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@ -100,6 +100,7 @@ RUN apk update && \
        sparse \
        spice-dev \
        spice-protocol \
+        swtpm \
        tar \
        tesseract-ocr \
        usbredir-dev \
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@ -107,6 +107,7 @@ RUN dnf distro-sync -y && \
        socat \
        spice-protocol \
        spice-server-devel \
+        swtpm \
        systemd-devel \
        systemtap-sdt-devel \
        tar \
--- a/tests/docker/dockerfiles/debian-amd64-cross.docker
+++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
@ -55,6 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      sed \
                      socat \
                      sparse \
+                      swtpm \
                      tar \
                      tesseract-ocr \
                      tesseract-ocr-eng \
--- a/tests/docker/dockerfiles/debian-amd64.docker
+++ b/tests/docker/dockerfiles/debian-amd64.docker
@ -124,6 +124,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      sed \
                      socat \
                      sparse \
+                      swtpm \
                      systemtap-sdt-dev \
                      tar \
                      tesseract-ocr \
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@ -55,6 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      sed \
                      socat \
                      sparse \
+                      swtpm \
                      tar \
                      tesseract-ocr \
                      tesseract-ocr-eng \
--- a/tests/docker/dockerfiles/debian-armhf-cross.docker
+++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
@ -55,6 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      sed \
                      socat \
                      sparse \
+                      swtpm \
                      tar \
                      tesseract-ocr \
                      tesseract-ocr-eng \
--- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
@ -55,6 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      sed \
                      socat \
                      sparse \
+                      swtpm \
                      tar \
                      tesseract-ocr \
                      tesseract-ocr-eng \
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@ -55,6 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      sed \
                      socat \
                      sparse \
+                      swtpm \
                      tar \
                      tesseract-ocr \
                      tesseract-ocr-eng \
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@ -55,6 +55,7 @@ exec "$@"\n' > /usr/bin/nosync && \
               socat \
               sparse \
               spice-protocol \
+               swtpm \
               tar \
               tesseract \
               tesseract-langpack-eng \
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@ -55,6 +55,7 @@ exec "$@"\n' > /usr/bin/nosync && \
               socat \
               sparse \
               spice-protocol \
+               swtpm \
               tar \
               tesseract \
               tesseract-langpack-eng \
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@ -118,6 +118,7 @@ exec "$@"\n' > /usr/bin/nosync && \
               sparse \
               spice-protocol \
               spice-server-devel \
+               swtpm \
               systemd-devel \
               systemtap-sdt-devel \
               tar \
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@ -100,6 +100,7 @@ RUN zypper update -y && \
           socat \
           sparse \
           spice-protocol-devel \
+           swtpm \
           systemd-devel \
           systemtap-sdt-devel \
           tar \
--- a/tests/docker/dockerfiles/ubuntu2204.docker
+++ b/tests/docker/dockerfiles/ubuntu2204.docker
@ -124,6 +124,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      sed \
                      socat \
                      sparse \
+                      swtpm \
                      systemtap-sdt-dev \
                      tar \
                      tesseract-ocr \
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@ -1 +1 @@
-Subproject commit e3ed1e5da101943e53d8d89424e17b22120743f5
+Subproject commit 36bc517161c45ead20224d47f2dc4fa428af6724
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@ -110,6 +110,7 @@ packages:
 - spice-protocol
 - spice-server
 - ssh-client
+ - swtpm
 - systemd
 - tar
 - tesseract