[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/30] tests/docker: update and flatten debian-sparc64-cross
From: |
Alex Bennée |
Subject: |
[PULL 13/30] tests/docker: update and flatten debian-sparc64-cross |
Date: |
Tue, 20 Sep 2022 18:15:16 +0100 |
Update to the latest stable Debian. While we are at it 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-14-alex.bennee@linaro.org>
diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
index 8a611fc824..db0ea15d0d 100644
--- a/.gitlab-ci.d/container-cross.yml
+++ b/.gitlab-ci.d/container-cross.yml
@@ -143,7 +143,6 @@ sh4-debian-cross-container:
sparc64-debian-cross-container:
extends: .container_job_template
stage: containers
- needs: ['amd64-debian10-container']
variables:
NAME: debian-sparc64-cross
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 37c4ea913f..8828b6b8fa 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -89,7 +89,6 @@ DOCKER_PARTIAL_IMAGES += fedora
endif
docker-image-debian-mips-cross: docker-image-debian10
-docker-image-debian-sparc64-cross: docker-image-debian10
# The native build should never use the registry
docker-image-debian-native: DOCKER_REGISTRY=
diff --git a/tests/docker/dockerfiles/debian-sparc64-cross.docker
b/tests/docker/dockerfiles/debian-sparc64-cross.docker
index f4bb9b561c..8d3d306bc1 100644
--- a/tests/docker/dockerfiles/debian-sparc64-cross.docker
+++ b/tests/docker/dockerfiles/debian-sparc64-cross.docker
@@ -1,12 +1,14 @@
#
# Docker cross-compiler target
#
-# This docker target builds on the debian Buster base image.
+# This docker target builds on the Debian Bullseye base image.
#
-FROM qemu/debian10
+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-sparc64-linux-gnu \
libc6-dev-sparc64-cross
--
2.34.1
- [PULL 03/30] tests/avocado: add explicit timeout for Aarch64 TCG tests, (continued)
- [PULL 03/30] tests/avocado: add explicit timeout for Aarch64 TCG tests, Alex Bennée, 2022/09/20
- [PULL 05/30] tests/avocado: add explicit timeout for ppc64le TCG tests, Alex Bennée, 2022/09/20
- [PULL 08/30] tests/docker: update and flatten debian-alpha-cross, Alex Bennée, 2022/09/20
- [PULL 10/30] tests/docker: update and flatten debian-m68k-cross, Alex Bennée, 2022/09/20
- [PULL 09/30] tests/docker: update and flatten debian-hppa-cross, Alex Bennée, 2022/09/20
- [PULL 07/30] tests/avocado: reduce the default timeout to 120s, Alex Bennée, 2022/09/20
- [PULL 06/30] tests/avocado: split the AST2x00Machine classes, Alex Bennée, 2022/09/20
- [PULL 11/30] tests/docker: update and flatten debian-mips64-cross, Alex Bennée, 2022/09/20
- [PULL 17/30] tests/vm: Remove obsolete Fedora VM test, Alex Bennée, 2022/09/20
- [PULL 19/30] gitlab-ci/custom-runners: Disable -static-pie for ubuntu-20.04-aarch64, Alex Bennée, 2022/09/20
- [PULL 13/30] tests/docker: update and flatten debian-sparc64-cross,
Alex Bennée <=
- [PULL 16/30] tests/docker: remove amd64 qemu/debian10 dependency, Alex Bennée, 2022/09/20
- [PULL 22/30] tests/docker: flatten debian-riscv64-test-cross, Alex Bennée, 2022/09/20
- [PULL 15/30] tests/docker: remove tricore qemu/debian10 dependency, Alex Bennée, 2022/09/20
- [PULL 25/30] tests/docker: update and flatten debian-amd64-cross, Alex Bennée, 2022/09/20
- [PULL 24/30] tests/lcitool: bump to latest version, Alex Bennée, 2022/09/20
- [PULL 27/30] tests/docker: update and flatten debian-hexagon-cross, Alex Bennée, 2022/09/20
- [PULL 20/30] gitlab-ci: update aarch32/aarch64 custom runner jobs, Alex Bennée, 2022/09/20
- [PULL 29/30] tests/docker: remove FROM qemu/ support from docker.py, Alex Bennée, 2022/09/20
- [PULL 21/30] Deprecate 32 bit big-endian MIPS, Alex Bennée, 2022/09/20
- [PULL 12/30] tests/docker: update and flatten debian-sh4-cross, Alex Bennée, 2022/09/20