[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/11] tests/docker: Remove the remainders of debian9 containers f
From: |
Alex Bennée |
Subject: |
[PULL 10/11] tests/docker: Remove the remainders of debian9 containers from the Makefile |
Date: |
Wed, 16 Dec 2020 16:48:26 +0000 |
From: Thomas Huth <thuth@redhat.com>
The Debian 9 containers have been removed a while ago, so we can
delete the corresponding entries in the Makefile, too.
Fixes: e3755276d1 ("tests/docker: Remove old Debian 9 containers")
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20201215083318.92205-1-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 02ec92830b..c254ac38d0 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -11,8 +11,7 @@ HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m))
DOCKER_SUFFIX := .docker
DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
# we don't run tests on intermediate images (used as base by another image)
-DOCKER_PARTIAL_IMAGES := debian9 debian10 debian11
-DOCKER_PARTIAL_IMAGES += debian9-mxe debian-bootstrap
+DOCKER_PARTIAL_IMAGES := debian10 debian11 debian-bootstrap
DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard
$(DOCKER_FILES_DIR)/*.docker))))
DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
# Use a global constant ccache directory to speed up repetitive builds
@@ -96,7 +95,6 @@ docker-binfmt-image-debian-%:
$(DOCKER_FILES_DIR)/debian-bootstrap.docker
endif
# Enforce dependencies for composite images
-docker-image-debian9-mxe: docker-image-debian9
ifeq ($(HOST_ARCH),x86_64)
docker-image-debian-amd64: docker-image-debian10
DOCKER_PARTIAL_IMAGES += debian-amd64-cross
@@ -104,8 +102,6 @@ else
docker-image-debian-amd64-cross: docker-image-debian10
DOCKER_PARTIAL_IMAGES += debian-amd64
endif
-docker-image-debian-win32-cross: docker-image-debian9-mxe
-docker-image-debian-win64-cross: docker-image-debian9-mxe
# For non-x86 hosts not all cross-compilers have been packaged
ifneq ($(HOST_ARCH),x86_64)
--
2.20.1
- [PULL 00/11] testing and configure updates, Alex Bennée, 2020/12/16
- [PULL 01/11] configure: include moxie-softmmu in deprecated_targets_list, Alex Bennée, 2020/12/16
- [PULL 02/11] gitlab: include aarch64-softmmu and ppc64-softmmu cross-system-build, Alex Bennée, 2020/12/16
- [PULL 03/11] configure: move gettext detection to meson.build, Alex Bennée, 2020/12/16
- [PULL 04/11] configure: add --without-default-features, Alex Bennée, 2020/12/16
- [PULL 05/11] python: add __repr__ to ConsoleSocket to aid debugging, Alex Bennée, 2020/12/16
- [PULL 06/11] gitlab: move --without-default-devices build from Travis, Alex Bennée, 2020/12/16
- [PULL 07/11] gitlab: add --without-default-features build, Alex Bennée, 2020/12/16
- [PULL 08/11] tests/tcg: build tests with -Werror, Alex Bennée, 2020/12/16
- [PULL 09/11] gitlab-CI: Test 32-bit builds with the fedora-i386-cross container, Alex Bennée, 2020/12/16
- [PULL 10/11] tests/docker: Remove the remainders of debian9 containers from the Makefile,
Alex Bennée <=
- [PULL 11/11] tests: update for rename of CentOS8 PowerTools repo, Alex Bennée, 2020/12/16
- Re: [PULL 00/11] testing and configure updates, Alex Bennée, 2020/12/16