[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/14] gitlab: record installed packages in /packages.txt in cont
From: |
Alex Bennée |
Subject: |
[PATCH 01/14] gitlab: record installed packages in /packages.txt in containers |
Date: |
Mon, 29 Jul 2024 15:44:01 +0100 |
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
- [PATCH 00/14] Various fixes and tweaks for 9.1-rc0/1, Alex Bennée, 2024/07/29
- [PATCH 02/14] gitlab: display /packages.txt in build jobs, Alex Bennée, 2024/07/29
- [PATCH 01/14] gitlab: record installed packages in /packages.txt in containers,
Alex Bennée <=
- [PATCH 03/14] tests/tcg: Use --noexecstack with assembler files, Alex Bennée, 2024/07/29
- [PATCH 05/14] tests/tcg: update README, Alex Bennée, 2024/07/29
- [PATCH 04/14] tests/tcg/loongarch64: Use --no-warn-rwx-segments to link system tests, Alex Bennée, 2024/07/29
- [PATCH 06/14] docs/devel: update the testing introduction, Alex Bennée, 2024/07/29
- [PATCH 09/14] tests/tcg: move test plugins into tcg subdir, Alex Bennée, 2024/07/29
- [PATCH 07/14] docs/devel: document how to run individual TCG tests, Alex Bennée, 2024/07/29
- [PATCH 12/14] contrib/plugins: be more vocal building, Alex Bennée, 2024/07/29
- [PATCH 11/14] contrib/plugins/cache.c: Remove redundant check of l2_access, Alex Bennée, 2024/07/29
- [PATCH 08/14] tests/avocado: remove tcg_plugins virt_mem_icount test, Alex Bennée, 2024/07/29