[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 30/30] tests/docker: remove the Debian base images
From: |
Alex Bennée |
Subject: |
[PULL 30/30] tests/docker: remove the Debian base images |
Date: |
Tue, 20 Sep 2022 18:15:33 +0100 |
We no longer use these in any of our images. Clean-up the remaining
comments and documentation that reference them and remove from the
build.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220914155950.804707-31-alex.bennee@linaro.org>
diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
index f35f117d95..aea5b42356 100644
--- a/docs/devel/testing.rst
+++ b/docs/devel/testing.rst
@@ -375,7 +375,7 @@ locally by using the ``NOCACHE`` build option:
.. code::
- make docker-image-debian10 NOCACHE=1
+ make docker-image-debian-arm64-cross NOCACHE=1
Images
~~~~~~
diff --git a/.gitlab-ci.d/container-core.yml b/.gitlab-ci.d/container-core.yml
index e8dd1f476a..08f8450fa1 100644
--- a/.gitlab-ci.d/container-core.yml
+++ b/.gitlab-ci.d/container-core.yml
@@ -10,8 +10,3 @@ amd64-fedora-container:
extends: .container_job_template
variables:
NAME: fedora
-
-amd64-debian10-container:
- extends: .container_job_template
- variables:
- NAME: debian10
diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
index be34cbc7ba..96d2a3b58b 100644
--- a/.gitlab-ci.d/containers.yml
+++ b/.gitlab-ci.d/containers.yml
@@ -7,11 +7,6 @@ amd64-alpine-container:
variables:
NAME: alpine
-amd64-debian11-container:
- extends: .container_job_template
- variables:
- NAME: debian11
-
amd64-debian-container:
extends: .container_job_template
stage: containers
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index a3174346da..270e99786e 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -69,9 +69,7 @@ docker-binfmt-image-debian-%:
$(DOCKER_FILES_DIR)/debian-bootstrap.docker
{ echo "You will need to build $(EXECUTABLE)"; exit
1;},\
"CHECK", "debian-$* exists"))
-# Enforce dependencies for composite images
-# we don't run tests on intermediate images (used as base by another image)
-DOCKER_PARTIAL_IMAGES := debian10 debian11
+# Special case cross-compiling x86_64 on non-x86_64 systems.
ifeq ($(HOST_ARCH),x86_64)
DOCKER_PARTIAL_IMAGES += debian-amd64-cross
else
@@ -89,10 +87,6 @@ endif
# The native build should never use the registry
docker-image-debian-native: DOCKER_REGISTRY=
-# base images should not add a local user
-docker-image-debian10: NOUSER=1
-docker-image-debian11: NOUSER=1
-
# alpine has no adduser
docker-image-alpine: NOUSER=1
diff --git a/tests/docker/dockerfiles/debian10.docker
b/tests/docker/dockerfiles/debian10.docker
deleted file mode 100644
index 03be923066..0000000000
--- a/tests/docker/dockerfiles/debian10.docker
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Docker multiarch cross-compiler target
-#
-# This docker target is builds on Debian cross compiler targets to build distro
-# with a selection of cross compilers for building test binaries.
-#
-# On its own you can't build much but the docker-foo-cross targets
-# build on top of the base debian image.
-#
-FROM docker.io/library/debian:buster-slim
-
-# Duplicate deb line as deb-src
-RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >>
/etc/apt/sources.list
-
-# Install common build utilities
-RUN apt update && \
- DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
- DEBIAN_FRONTEND=noninteractive eatmydata \
- apt install -y --no-install-recommends \
- bc \
- build-essential \
- ca-certificates \
- ccache \
- clang \
- dbus \
- gdb-multiarch \
- gettext \
- git \
- libffi-dev \
- libncurses5-dev \
- ninja-build \
- pkg-config \
- psmisc \
- python3 \
- python3-sphinx \
- python3-sphinx-rtd-theme \
- python3-venv \
- $(apt-get -s build-dep --arch-only qemu | egrep ^Inst | fgrep '[all]'
| cut -d\ -f2)
diff --git a/tests/docker/dockerfiles/debian11.docker
b/tests/docker/dockerfiles/debian11.docker
deleted file mode 100644
index febf884f8f..0000000000
--- a/tests/docker/dockerfiles/debian11.docker
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Docker multiarch cross-compiler target
-#
-# This docker target uses the current development version of Debian as
-# a base for cross compilers for building test binaries. We won't
-# attempt to build QEMU on it yet given it is still in development.
-#
-# On its own you can't build much but the docker-foo-cross targets
-# build on top of the base debian image.
-#
-FROM docker.io/library/debian:bullseye-slim
-
-# Duplicate deb line as deb-src
-RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >>
/etc/apt/sources.list
-
-# Install common build utilities
-RUN apt update && \
- DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata
--
2.34.1
- [PULL 16/30] tests/docker: remove amd64 qemu/debian10 dependency, (continued)
- [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
- [PULL 30/30] tests/docker: remove the Debian base images,
Alex Bennée <=
- [PULL 26/30] tests/docker: update and flatten debian-loongarch-cross, Alex Bennée, 2022/09/20
- [PULL 18/30] configure: explicitly set cflags for --disable-pie, Alex Bennée, 2022/09/20
- [PULL 23/30] tests/docker: update and flatten debian-all-test-cross, Alex Bennée, 2022/09/20
- [PULL 28/30] tests/docker: update and flatten debian-toolchain, Alex Bennée, 2022/09/20
- [PULL 14/30] tests/docker: flatten debian-powerpc-test-cross, Alex Bennée, 2022/09/20
- Re: [PULL 00/30] testing updates (docker, avocado, deprecate 32bit BE MIPS), Stefan Hajnoczi, 2022/09/22