[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 24/28] docker: remove 'deprecated' image definitions
From: |
Alex Bennée |
Subject: |
[PULL 24/28] docker: remove 'deprecated' image definitions |
Date: |
Thu, 26 Sep 2019 19:35:49 +0100 |
From: John Snow <address@hidden>
There isn't a debian.dockerfile anymore,
so perform some ghost-busting.
Signed-off-by: John Snow <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Philippe Mathieu-Daudé <address@hidden>
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 47ff777440..a19341e326 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -4,11 +4,10 @@
DOCKER_SUFFIX := .docker
DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
-DOCKER_DEPRECATED_IMAGES := debian
# we don't run tests on intermediate images (used as base by another image)
-DOCKER_PARTIAL_IMAGES := debian debian9 debian10 debian-sid
+DOCKER_PARTIAL_IMAGES := debian9 debian10 debian-sid
DOCKER_PARTIAL_IMAGES += debian9-mxe debian-ports debian-bootstrap
-DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir
$(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))))
+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
DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
@@ -158,7 +157,7 @@ docker-image-debian-powerpc-user-cross:
docker-binfmt-image-debian-powerpc-user
DOCKER_USER_IMAGES += debian-powerpc-user
# Expand all the pre-requistes for each docker image and test combination
-$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)
$(DOCKER_DEPRECATED_IMAGES)), \
+$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \
$(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \
$(eval .PHONY: docker-$t@$i) \
$(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \
--
2.20.1
- [PULL 05/28] target/alpha: Write to fpcr_flush_to_zero once, (continued)
- [PULL 05/28] target/alpha: Write to fpcr_flush_to_zero once, Alex Bennée, 2019/09/26
- [PULL 04/28] target/alpha: Handle SWCR_MAP_DMZ earlier, Alex Bennée, 2019/09/26
- [PULL 06/28] target/alpha: Mask IOV exception with INV for user-only, Alex Bennée, 2019/09/26
- [PULL 09/28] tests/docker: add sanitizers back to clang build, Alex Bennée, 2019/09/26
- [PULL 08/28] target/ppc: fix signal delivery for ppc64abi32, Alex Bennée, 2019/09/26
- [PULL 10/28] tests/docker: fix DOCKER_PARTIAL_IMAGES, Alex Bennée, 2019/09/26
- [PULL 07/28] target/alpha: Tidy helper_fp_exc_raise_s, Alex Bennée, 2019/09/26
- [PULL 11/28] tests/docker: remove python2.7 from debian9-mxe, Alex Bennée, 2019/09/26
- [PULL 13/28] podman: fix command invocation, Alex Bennée, 2019/09/26
- [PULL 14/28] tests/tcg: clean-up some comments after the de-tangling, Alex Bennée, 2019/09/26
- [PULL 24/28] docker: remove 'deprecated' image definitions,
Alex Bennée <=
- [PULL 12/28] tests/docker: reduce scary warnings by cleaning up clean up, Alex Bennée, 2019/09/26
- [PULL 17/28] tests/tcg: add generic version of float_convs, Alex Bennée, 2019/09/26
- [PULL 26/28] docker: remove unused debian-sid, Alex Bennée, 2019/09/26
- [PULL 19/28] configure: preserve PKG_CONFIG for subdir builds, Alex Bennée, 2019/09/26
- [PULL 22/28] docker: remove debian8-mxe definitions, Alex Bennée, 2019/09/26
- [PULL 25/28] docker: remove unused debian-ports, Alex Bennée, 2019/09/26
- [PULL 27/28] docker: move tests from python2 to python3, Alex Bennée, 2019/09/26
- [PULL 18/28] tests/tcg: add simple record/replay smoke test for aarch64, Alex Bennée, 2019/09/26
- [PULL 23/28] docker: remove unused debian8 partial image, Alex Bennée, 2019/09/26
- [PULL 28/28] tests/docker: remove debian-powerpc-user-cross, Alex Bennée, 2019/09/26