From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Eduardo Habkost" <eduardo@habkost.net>,
"Thomas Huth" <thuth@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Bin Meng" <bmeng.cn@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
qemu-riscv@nongnu.org, "Weiwei Li" <liwei1518@gmail.com>,
"Pierrick Bouvier" <pierrick.bouvier@linaro.org>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Liu Zhiwei" <zhiwei_liu@linux.alibaba.com>,
"Daniel Henrique Barboza" <dbarboza@ventanamicro.com>,
qemu-s390x@nongnu.org, "Cleber Rosa" <crosa@redhat.com>,
"Ilya Leoshkevich" <iii@linux.ibm.com>,
"Mahmoud Mandour" <ma.mandourr@gmail.com>,
qemu-arm@nongnu.org, "Alexandre Iooss" <erdnaxe@crans.org>,
"Song Gao" <gaosong@loongson.cn>,
"David Hildenbrand" <david@redhat.com>,
"Alistair Francis" <alistair.francis@wdc.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PATCH 01/14] gitlab: record installed packages in /packages.txt in containers
Date: Mon, 29 Jul 2024 15:44:01 +0100 [thread overview]
Message-ID: <20240729144414.830369-2-alex.bennee@linaro.org> (raw)
In-Reply-To: <20240729144414.830369-1-alex.bennee@linaro.org>
From: Daniel P. Berrangé <berrange@redhat.com>
The lcitool created containers save the full distro package list
details into /packages.txt. The idea is that build jobs will 'cat'
this file, so that the build log has a record of what packages
were used. This is important info, because when it comes to debug
failures, the original container is often lost.
This extends the manually written dockerfiles to also create the
/packages.txt file.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20240724095505.33544-2-berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/docker/dockerfiles/debian-all-test-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-hexagon-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-legacy-test-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-loongarch-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-tricore-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-xtensa-cross.docker | 3 ++-
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker
index 6cc38a3633..8ab244e018 100644
--- a/tests/docker/dockerfiles/debian-all-test-cross.docker
+++ b/tests/docker/dockerfiles/debian-all-test-cross.docker
@@ -62,7 +62,8 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
gcc-s390x-linux-gnu \
libc6-dev-s390x-cross \
gcc-sparc64-linux-gnu \
- libc6-dev-sparc64-cross
+ libc6-dev-sparc64-cross && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools
diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/docker/dockerfiles/debian-hexagon-cross.docker
index f2d40f2dee..23152b4918 100644
--- a/tests/docker/dockerfiles/debian-hexagon-cross.docker
+++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker
@@ -33,7 +33,8 @@ RUN apt-get update && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
RUN /usr/bin/pip3 install tomli
diff --git a/tests/docker/dockerfiles/debian-legacy-test-cross.docker b/tests/docker/dockerfiles/debian-legacy-test-cross.docker
index d75e0b85e2..5a6616b7d3 100644
--- a/tests/docker/dockerfiles/debian-legacy-test-cross.docker
+++ b/tests/docker/dockerfiles/debian-legacy-test-cross.docker
@@ -36,7 +36,8 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
python3-pip \
python3-setuptools \
python3-venv \
- python3-wheel
+ python3-wheel && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
RUN /usr/bin/pip3 install tomli
diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker b/tests/docker/dockerfiles/debian-loongarch-cross.docker
index 6a9197528b..79eab5621e 100644
--- a/tests/docker/dockerfiles/debian-loongarch-cross.docker
+++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker
@@ -32,7 +32,8 @@ RUN apt-get update && \
python3-pip \
python3-setuptools \
python3-venv \
- python3-wheel
+ python3-wheel && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
RUN /usr/bin/pip3 install tomli
diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker
index 16276aa21d..479b4d6eba 100644
--- a/tests/docker/dockerfiles/debian-tricore-cross.docker
+++ b/tests/docker/dockerfiles/debian-tricore-cross.docker
@@ -34,7 +34,8 @@ RUN apt update && \
python3-pip \
python3-setuptools \
python3-wheel \
- python3-venv
+ python3-venv && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
RUN /usr/bin/pip3 install tomli
diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/docker/dockerfiles/debian-xtensa-cross.docker
index 413881899b..d011eee2ad 100644
--- a/tests/docker/dockerfiles/debian-xtensa-cross.docker
+++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker
@@ -16,7 +16,8 @@ RUN apt-get update && \
curl \
gettext \
git \
- python3-minimal
+ python3-minimal && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
ENV CPU_LIST dc232b dc233c de233_fpu dsp3400
ENV TOOLCHAIN_RELEASE 2020.07
--
2.39.2
next prev parent reply other threads:[~2024-07-29 14:45 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-29 14:44 [PATCH 00/14] Various fixes and tweaks for 9.1-rc0/1 Alex Bennée
2024-07-29 14:44 ` Alex Bennée [this message]
2024-07-29 22:21 ` [PATCH 01/14] gitlab: record installed packages in /packages.txt in containers Richard Henderson
2024-07-29 14:44 ` [PATCH 02/14] gitlab: display /packages.txt in build jobs Alex Bennée
2024-07-29 22:22 ` Richard Henderson
2024-07-29 14:44 ` [PATCH 03/14] tests/tcg: Use --noexecstack with assembler files Alex Bennée
2024-07-29 14:44 ` [PATCH 04/14] tests/tcg/loongarch64: Use --no-warn-rwx-segments to link system tests Alex Bennée
2024-07-29 14:44 ` [PATCH 05/14] tests/tcg: update README Alex Bennée
2024-07-29 22:23 ` Richard Henderson
2024-07-29 14:44 ` [PATCH 06/14] docs/devel: update the testing introduction Alex Bennée
2024-07-29 22:24 ` Richard Henderson
2024-07-29 14:44 ` [PATCH 07/14] docs/devel: document how to run individual TCG tests Alex Bennée
2024-07-29 22:25 ` Richard Henderson
2024-07-29 14:44 ` [PATCH 08/14] tests/avocado: remove tcg_plugins virt_mem_icount test Alex Bennée
2024-07-29 22:26 ` Richard Henderson
2024-08-12 6:25 ` Thomas Huth
2024-07-29 14:44 ` [PATCH 09/14] tests/tcg: move test plugins into tcg subdir Alex Bennée
2024-07-29 15:15 ` Philippe Mathieu-Daudé
2024-07-29 22:27 ` Richard Henderson
2024-07-29 14:44 ` [PATCH 10/14] docs: split TCG plugin usage from devel section Alex Bennée
2024-07-29 22:29 ` Richard Henderson
2024-07-29 14:44 ` [PATCH 11/14] contrib/plugins/cache.c: Remove redundant check of l2_access Alex Bennée
2024-07-29 22:30 ` Richard Henderson
2024-07-29 14:44 ` [PATCH 12/14] contrib/plugins: be more vocal building Alex Bennée
2024-07-29 14:44 ` [PATCH 13/14] contrib/plugins: add compat for g_memdup2 Alex Bennée
2024-07-29 15:16 ` Philippe Mathieu-Daudé
2024-07-29 14:44 ` [PATCH 14/14] plugin/loader: handle basic help query Alex Bennée
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=20240729144414.830369-2-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=berrange@redhat.com \
--cc=bleal@redhat.com \
--cc=bmeng.cn@gmail.com \
--cc=crosa@redhat.com \
--cc=david@redhat.com \
--cc=dbarboza@ventanamicro.com \
--cc=eduardo@habkost.net \
--cc=erdnaxe@crans.org \
--cc=gaosong@loongson.cn \
--cc=iii@linux.ibm.com \
--cc=liwei1518@gmail.com \
--cc=ma.mandourr@gmail.com \
--cc=palmer@dabbelt.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=pierrick.bouvier@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=zhiwei_liu@linux.alibaba.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).