From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: stefanha@redhat.com, "Alex Bennée" <alex.bennee@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>
Subject: [PULL 14/30] tests/docker: flatten debian-powerpc-test-cross
Date: Tue, 20 Sep 2022 18:15:17 +0100 [thread overview]
Message-ID: <20220920171533.1098094-15-alex.bennee@linaro.org> (raw)
In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org>
Flatten into a single dockerfile. We really don't need the rest of the
stuff from the QEMU base image just to compile test images.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220914155950.804707-15-alex.bennee@linaro.org>
diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
index db0ea15d0d..67bbf19a27 100644
--- a/.gitlab-ci.d/container-cross.yml
+++ b/.gitlab-ci.d/container-cross.yml
@@ -102,7 +102,6 @@ mipsel-debian-cross-container:
powerpc-test-cross-container:
extends: .container_job_template
stage: containers
- needs: ['amd64-debian11-container']
variables:
NAME: debian-powerpc-test-cross
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 8828b6b8fa..e034eca3af 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -137,7 +137,6 @@ docker-image-debian-all-test-cross: docker-image-debian10
docker-image-debian-loongarch-cross: docker-image-debian11
docker-image-debian-microblaze-cross: docker-image-debian10
docker-image-debian-nios2-cross: docker-image-debian10
-docker-image-debian-powerpc-test-cross: docker-image-debian11
docker-image-debian-riscv64-test-cross: docker-image-debian11
# These images may be good enough for building tests but not for test builds
diff --git a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker
index 36b336f709..d6b2909cc4 100644
--- a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker
+++ b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker
@@ -1,13 +1,15 @@
#
# Docker powerpc/ppc64/ppc64le cross-compiler target
#
-# This docker target builds on the debian Bullseye base image.
+# This docker target builds on the Debian Bullseye base image.
#
-FROM qemu/debian11
+FROM docker.io/library/debian:11-slim
-RUN apt update && \
- DEBIAN_FRONTEND=noninteractive eatmydata \
- apt install -y --no-install-recommends \
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
gcc-powerpc-linux-gnu \
libc6-dev-powerpc-cross \
gcc-10-powerpc64-linux-gnu \
--
2.34.1
next prev parent reply other threads:[~2022-09-20 22:58 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-20 17:15 [PULL 00/30] testing updates (docker, avocado, deprecate 32bit BE MIPS) Alex Bennée
2022-09-20 17:15 ` [PULL 01/30] gitlab: reduce targets in cross_user_build_job Alex Bennée
2022-09-20 17:15 ` [PULL 02/30] tests/avocado/boot_linux_console: Fix the test_aarch64_xlnx_versal_virt test Alex Bennée
2022-09-20 17:15 ` [PULL 03/30] tests/avocado: add explicit timeout for Aarch64 TCG tests Alex Bennée
2022-09-20 17:15 ` [PULL 04/30] tests/avocado: add explicit timeout for s390 " Alex Bennée
2022-09-26 16:27 ` Thomas Huth
2022-09-20 17:15 ` [PULL 05/30] tests/avocado: add explicit timeout for ppc64le " Alex Bennée
2022-09-20 17:15 ` [PULL 06/30] tests/avocado: split the AST2x00Machine classes Alex Bennée
2022-09-20 17:15 ` [PULL 07/30] tests/avocado: reduce the default timeout to 120s Alex Bennée
2022-09-20 17:15 ` [PULL 08/30] tests/docker: update and flatten debian-alpha-cross Alex Bennée
2022-09-20 17:15 ` [PULL 09/30] tests/docker: update and flatten debian-hppa-cross Alex Bennée
2022-09-20 17:15 ` [PULL 10/30] tests/docker: update and flatten debian-m68k-cross Alex Bennée
2022-09-20 17:15 ` [PULL 11/30] tests/docker: update and flatten debian-mips64-cross Alex Bennée
2022-09-20 17:15 ` [PULL 12/30] tests/docker: update and flatten debian-sh4-cross Alex Bennée
2022-09-20 17:15 ` [PULL 13/30] tests/docker: update and flatten debian-sparc64-cross Alex Bennée
2022-09-20 17:15 ` Alex Bennée [this message]
2022-09-20 17:15 ` [PULL 15/30] tests/docker: remove tricore qemu/debian10 dependency Alex Bennée
2022-09-20 17:15 ` [PULL 16/30] tests/docker: remove amd64 " Alex Bennée
2022-09-20 17:15 ` [PULL 17/30] tests/vm: Remove obsolete Fedora VM test Alex Bennée
2022-09-20 17:15 ` [PULL 18/30] configure: explicitly set cflags for --disable-pie Alex Bennée
2022-09-20 17:15 ` [PULL 19/30] gitlab-ci/custom-runners: Disable -static-pie for ubuntu-20.04-aarch64 Alex Bennée
2022-09-20 17:15 ` [PULL 20/30] gitlab-ci: update aarch32/aarch64 custom runner jobs Alex Bennée
2022-09-20 17:15 ` [PULL 21/30] Deprecate 32 bit big-endian MIPS Alex Bennée
2022-09-20 17:15 ` [PULL 22/30] tests/docker: flatten debian-riscv64-test-cross Alex Bennée
2022-09-20 17:15 ` [PULL 23/30] tests/docker: update and flatten debian-all-test-cross Alex Bennée
2022-09-20 17:15 ` [PULL 24/30] tests/lcitool: bump to latest version Alex Bennée
2022-09-20 17:15 ` [PULL 25/30] tests/docker: update and flatten debian-amd64-cross Alex Bennée
2022-09-20 17:15 ` [PULL 26/30] tests/docker: update and flatten debian-loongarch-cross Alex Bennée
2022-09-20 17:15 ` [PULL 27/30] tests/docker: update and flatten debian-hexagon-cross Alex Bennée
2022-09-20 17:15 ` [PULL 28/30] tests/docker: update and flatten debian-toolchain Alex Bennée
2022-09-20 17:15 ` [PULL 29/30] tests/docker: remove FROM qemu/ support from docker.py Alex Bennée
2022-09-20 17:15 ` [PULL 30/30] tests/docker: remove the Debian base images Alex Bennée
2022-09-22 17:16 ` [PULL 00/30] testing updates (docker, avocado, deprecate 32bit BE MIPS) Stefan Hajnoczi
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=20220920171533.1098094-15-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=f4bug@amsat.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).