On 9/23/19 8:11 PM, John Snow wrote: > There isn't a debian.dockerfile anymore, > so perform some ghost-busting. > > Signed-off-by: John Snow <js...@redhat.com> > --- > tests/docker/Makefile.include | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include > index b20a810016..983224ad96 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 > @@ -159,7 +158,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) \ >
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
