Skip to contentSkip to conversation

tests/docker: Remove the remainders of debian9 containers from the Makefile

PATCH In review Thomas Huth 3 participants 3 messages Dec 15, 2020 – Dec 16, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/docker: Remove the remainders of debian9 containers from the Makefile

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")
---
 tests/docker/Makefile.include | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
tests/docker/Makefile.include +1 -5
index 02ec92830b..c254ac38d0 100644
@@ -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)
Signature · 1 line
2.27.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Thomas Huth

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")
---
  tests/docker/Makefile.include | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)
Quoted 32 lines
tests/docker/Makefile.include +1 -5
index 02ec92830b..c254ac38d0 100644
@@ -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 lore raw
In reply to Thomas Huth
Quoted 5 lines · Thomas Huth

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")

Queued to pr/161220-testing-1, thanks.

Signature · 1 line
Alex Bennée