From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: John Snow <jsnow@redhat.com>, qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>, "Alex Bennée" <alex.bennee@linaro.org>
Subject: Re: [PATCH v3 3/6] docker: remove 'deprecated' image definitions
Date: Tue, 24 Sep 2019 17:05:31 +0200 [thread overview]
Message-ID: <c990f39e-5748-c6a3-b071-0d4f279d2a1c@redhat.com> (raw)
In-Reply-To: <20190923181140.7235-4-jsnow@redhat.com>
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 <jsnow@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é <philmd@redhat.com>
next prev parent reply other threads:[~2019-09-24 15:55 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-23 18:11 [PATCH v3 0/6] docker: misc cleanups John Snow
2019-09-23 18:11 ` [PATCH v3 1/6] docker: remove debian8-mxe definitions John Snow
2019-09-23 18:11 ` [PATCH v3 2/6] docker: removed unused debian8 partial image John Snow
2019-09-23 18:11 ` [PATCH v3 3/6] docker: remove 'deprecated' image definitions John Snow
2019-09-24 15:05 ` Philippe Mathieu-Daudé [this message]
2019-09-23 18:11 ` [PATCH v3 4/6] docker: remove unused debian-ports John Snow
2019-09-24 15:05 ` Philippe Mathieu-Daudé
2019-09-23 18:11 ` [PATCH v3 5/6] docker: remove unused debian-sid John Snow
2019-09-24 15:06 ` Philippe Mathieu-Daudé
2019-09-23 18:11 ` [PATCH v3 6/6] docker: move tests from python2 to python3 John Snow
2019-09-24 15:08 ` Philippe Mathieu-Daudé
2019-09-23 18:17 ` [PATCH v3 0/6] docker: misc cleanups John Snow
2019-09-24 15:13 ` Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c990f39e-5748-c6a3-b071-0d4f279d2a1c@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=fam@euphon.net \
--cc=jsnow@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).