From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Michael Roth" <michael.roth@amd.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Kevin Wolf" <kwolf@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Beraldo Leal" <bleal@redhat.com>,
"Alexander Bulekov" <alxndr@bu.edu>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Markus Armbruster" <armbru@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Darren Kenny" <darren.kenny@oracle.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>, "John Snow" <jsnow@redhat.com>,
"Ed Maste" <emaste@freebsd.org>,
qemu-arm@nongnu.org, "Fam Zheng" <fam@euphon.net>,
"Thomas Huth" <thuth@redhat.com>,
"Yonggang Luo" <luoyonggang@gmail.com>,
qemu-block@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Bandan Das" <bsd@redhat.com>, "Li-Wen Hsu" <lwhsu@freebsd.org>,
"Pavel Dovgalyuk" <pavel.dovgaluk@ispras.ru>,
"Laurent Vivier" <lvivier@redhat.com>,
"Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>,
"Qiuhao Li" <Qiuhao.Li@outlook.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>
Subject: [PATCH v3 23/24] tests/docker: add zstdtools to the images (!AWAITING UPSTREAM)
Date: Tue, 28 Feb 2023 19:06:52 +0000 [thread overview]
Message-ID: <20230228190653.1602033-24-alex.bennee@linaro.org> (raw)
In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org>
We need this to be able to run the tuxrun_baseline tests in CI which
in turn helps us reduce overhead running other tests.
[See https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/361]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/docker/dockerfiles/alpine.docker | 1 +
tests/docker/dockerfiles/centos8.docker | 3 ++-
tests/docker/dockerfiles/debian-amd64-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-amd64.docker | 3 ++-
tests/docker/dockerfiles/debian-arm64-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-armel-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-armhf-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-mips64el-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-mipsel-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-ppc64el-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-s390x-cross.docker | 3 ++-
tests/docker/dockerfiles/fedora-win32-cross.docker | 3 ++-
tests/docker/dockerfiles/fedora-win64-cross.docker | 3 ++-
tests/docker/dockerfiles/fedora.docker | 3 ++-
tests/docker/dockerfiles/opensuse-leap.docker | 3 ++-
tests/docker/dockerfiles/ubuntu2004.docker | 3 ++-
tests/docker/dockerfiles/ubuntu2204.docker | 3 ++-
tests/lcitool/projects/qemu.yml | 1 +
18 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index 33e4823400..51f0957c67 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -110,6 +110,7 @@ RUN apk update && \
xfsprogs-dev \
zlib-dev \
zlib-static \
+ zstd \
zstd-dev && \
apk list | sort > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
index 28c5e7e43c..2a0ed397e8 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -118,7 +118,8 @@ RUN dnf distro-sync -y && \
which \
xfsprogs-devel \
zlib-devel \
- zlib-static && \
+ zlib-static \
+ zstd && \
dnf autoremove -y && \
dnf clean all -y && \
rpm -qa | sort > /packages.txt && \
diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker
index 5d03b5c22d..afb1cbd046 100644
--- a/tests/docker/dockerfiles/debian-amd64-cross.docker
+++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
@@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \
tar \
tesseract-ocr \
- tesseract-ocr-eng && \
+ tesseract-ocr-eng \
+ zstd && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker
index febc46e700..28e2fa81b1 100644
--- a/tests/docker/dockerfiles/debian-amd64.docker
+++ b/tests/docker/dockerfiles/debian-amd64.docker
@@ -127,7 +127,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tesseract-ocr \
tesseract-ocr-eng \
xfslibs-dev \
- zlib1g-dev && \
+ zlib1g-dev \
+ zstd && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker
index b9501a21bc..b4f7a7f903 100644
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \
tar \
tesseract-ocr \
- tesseract-ocr-eng && \
+ tesseract-ocr-eng \
+ zstd && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker
index f21742ede5..4b4191f824 100644
--- a/tests/docker/dockerfiles/debian-armel-cross.docker
+++ b/tests/docker/dockerfiles/debian-armel-cross.docker
@@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \
tar \
tesseract-ocr \
- tesseract-ocr-eng && \
+ tesseract-ocr-eng \
+ zstd && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker
index decdeda6f2..c9b6b2e563 100644
--- a/tests/docker/dockerfiles/debian-armhf-cross.docker
+++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
@@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \
tar \
tesseract-ocr \
- tesseract-ocr-eng && \
+ tesseract-ocr-eng \
+ zstd && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker
index 1df05fcf20..cfe4f9a0d7 100644
--- a/tests/docker/dockerfiles/debian-mips64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker
@@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \
tar \
tesseract-ocr \
- tesseract-ocr-eng && \
+ tesseract-ocr-eng \
+ zstd && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker
index 019b8dcaff..8e521fc9ee 100644
--- a/tests/docker/dockerfiles/debian-mipsel-cross.docker
+++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker
@@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \
tar \
tesseract-ocr \
- tesseract-ocr-eng && \
+ tesseract-ocr-eng \
+ zstd && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
index 3ceab4c502..b1b8277f3f 100644
--- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
@@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \
tar \
tesseract-ocr \
- tesseract-ocr-eng && \
+ tesseract-ocr-eng \
+ zstd && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
index 6c216dde48..af39568ce5 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \
tar \
tesseract-ocr \
- tesseract-ocr-eng && \
+ tesseract-ocr-eng \
+ zstd && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker
index a5689b616b..f092b333c9 100644
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@@ -59,7 +59,8 @@ exec "$@"' > /usr/bin/nosync && \
tesseract \
tesseract-langpack-eng \
util-linux \
- which && \
+ which \
+ zstd && \
nosync dnf autoremove -y && \
nosync dnf clean all -y
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index c066c20241..f35cd5145e 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -59,7 +59,8 @@ exec "$@"' > /usr/bin/nosync && \
tesseract \
tesseract-langpack-eng \
util-linux \
- which && \
+ which \
+ zstd && \
nosync dnf autoremove -y && \
nosync dnf clean all -y
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 4dd1fce890..e030c5fb1e 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -130,7 +130,8 @@ exec "$@"' > /usr/bin/nosync && \
xen-devel \
xfsprogs-devel \
zlib-devel \
- zlib-static && \
+ zlib-static \
+ zstd && \
nosync dnf autoremove -y && \
nosync dnf clean all -y && \
rpm -qa | sort > /packages.txt && \
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index 7ea22a8c1e..335d3e071c 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -120,7 +120,8 @@ RUN zypper update -y && \
xen-devel \
xfsprogs-devel \
zlib-devel \
- zlib-devel-static && \
+ zlib-devel-static \
+ zstd && \
zypper clean --all && \
rpm -qa | sort > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index ed5855295f..2c3d539949 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -126,7 +126,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tesseract-ocr \
tesseract-ocr-eng \
xfslibs-dev \
- zlib1g-dev && \
+ zlib1g-dev \
+ zstd && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker
index 6fea090f02..3f7d30e5d0 100644
--- a/tests/docker/dockerfiles/ubuntu2204.docker
+++ b/tests/docker/dockerfiles/ubuntu2204.docker
@@ -127,7 +127,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tesseract-ocr \
tesseract-ocr-eng \
xfslibs-dev \
- zlib1g-dev && \
+ zlib1g-dev \
+ zstd && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index 2854748f49..af3700379a 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -116,5 +116,6 @@ packages:
- which
- xen
- xfsprogs
+ - zstdtools
- zlib
- zlib-static
--
2.39.2
next prev parent reply other threads:[~2023-02-28 19:15 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-28 19:06 [PATCH v3 00/24] testing/next: docker, avocado, unit, gitlab Alex Bennée
2023-02-28 19:06 ` [PATCH v3 01/24] tests: don't run socat tests on MacOS as well Alex Bennée
2023-02-28 19:06 ` [PATCH v3 02/24] tests: add socat dependency for tests Alex Bennée
2023-02-28 19:06 ` [PATCH v3 03/24] tests: be a bit more strict cleaning up fifos Alex Bennée
2023-02-28 19:06 ` [PATCH v3 04/24] tests: make fp-test less chatty when running from test suite Alex Bennée
2023-02-28 21:58 ` Richard Henderson
2023-02-28 19:06 ` [PATCH v3 05/24] gitlab-ci: Use artifacts instead of dumping logs in the Cirrus-CI jobs Alex Bennée
2023-02-28 19:06 ` [PATCH v3 06/24] gitlab: extend custom runners with base_job_template Alex Bennée
2023-02-28 19:06 ` [PATCH v3 07/24] tests: don't run benchmarks for the tsan build Alex Bennée
2023-02-28 21:59 ` Richard Henderson
2023-02-28 19:06 ` [PATCH v3 08/24] testing: update ubuntu2004 to ubuntu2204 Alex Bennée
2023-02-28 19:06 ` [PATCH v3 09/24] tests: skip the nios2 replay_kernel test Alex Bennée
2023-02-28 19:06 ` [PATCH v3 10/24] tests: add tuxrun baseline test to avocado Alex Bennée
2023-02-28 19:06 ` [PATCH v3 11/24] tests/docker: Use binaries for debian-tricore-cross Alex Bennée
2023-02-28 19:06 ` [PATCH v3 12/24] tests: ensure we export job results for some cross builds Alex Bennée
2023-02-28 19:06 ` [PATCH v3 13/24] cirrus.yml: Improve the windows_msys2_task Alex Bennée
2023-02-28 19:06 ` [PATCH v3 14/24] tests/dockerfiles: unify debian-toolchain references Alex Bennée
2023-02-28 19:06 ` [PATCH v3 15/24] gitlab: Use plain docker in container-template.yml Alex Bennée
2023-02-28 19:06 ` [PATCH v3 16/24] tests: Ensure TAP version is printed before other messages Alex Bennée
2023-02-28 19:06 ` [PATCH v3 17/24] configure: expose the direct container command Alex Bennée
2023-02-28 19:06 ` [PATCH v3 18/24] tests/lcitool: append user setting stanza to dockerfiles Alex Bennée
2023-03-01 9:08 ` Daniel P. Berrangé
2023-02-28 19:06 ` [PATCH v3 19/24] tests/docker: add USER stanzas to non-lci images Alex Bennée
2023-02-28 19:06 ` [PATCH v3 20/24] tests/docker: use direct RUNC call to build containers Alex Bennée
2023-02-28 19:06 ` [PATCH v3 21/24] tests/docker: use direct RUNC call to run test jobs Alex Bennée
2023-02-28 19:06 ` [PATCH v3 22/24] gitlab: move the majority of artefact handling to a template Alex Bennée
2023-02-28 21:41 ` Philippe Mathieu-Daudé
2023-02-28 21:55 ` Alex Bennée
2023-03-01 10:44 ` Philippe Mathieu-Daudé
2023-03-01 6:51 ` Thomas Huth
2023-03-01 7:32 ` Philippe Mathieu-Daudé
2023-03-01 10:00 ` Alex Bennée
2023-03-01 10:41 ` Philippe Mathieu-Daudé
2023-03-01 11:00 ` Alex Bennée
2023-03-01 7:38 ` Philippe Mathieu-Daudé
2023-03-01 10:01 ` Alex Bennée
2023-03-01 10:43 ` Philippe Mathieu-Daudé
2023-02-28 19:06 ` Alex Bennée [this message]
2023-03-01 10:36 ` [PATCH v3 23/24] tests/docker: add zstdtools to the images (!AWAITING UPSTREAM) Philippe Mathieu-Daudé
2023-03-01 10:59 ` Alex Bennée
2023-03-01 11:06 ` Philippe Mathieu-Daudé
2023-02-28 19:06 ` [PATCH v3 24/24] tests/avocado: disable BootLinuxPPC64 test in CI Alex Bennée
2023-02-28 21:53 ` Philippe Mathieu-Daudé
2023-03-01 7:14 ` Thomas Huth
2023-03-01 9:57 ` Alex Bennée
2023-03-01 11:12 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230228190653.1602033-24-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=Qiuhao.Li@outlook.com \
--cc=alxndr@bu.edu \
--cc=armbru@redhat.com \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=bleal@redhat.com \
--cc=bsd@redhat.com \
--cc=crosa@redhat.com \
--cc=darren.kenny@oracle.com \
--cc=emaste@freebsd.org \
--cc=fam@euphon.net \
--cc=hreitz@redhat.com \
--cc=jsnow@redhat.com \
--cc=kbastian@mail.uni-paderborn.de \
--cc=kwolf@redhat.com \
--cc=luoyonggang@gmail.com \
--cc=lvivier@redhat.com \
--cc=lwhsu@freebsd.org \
--cc=marcandre.lureau@redhat.com \
--cc=michael.roth@amd.com \
--cc=pavel.dovgaluk@ispras.ru \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).