From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Alex Bennée" <alex.bennee@linaro.org>,
"John Snow" <jsnow@redhat.com>,
qemu-devel@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 24/28] docker: remove 'deprecated' image definitions
Date: Thu, 26 Sep 2019 19:35:49 +0100 [thread overview]
Message-ID: <20190926183553.13895-25-alex.bennee@linaro.org> (raw)
In-Reply-To: <20190926183553.13895-1-alex.bennee@linaro.org>
From: John Snow <jsnow@redhat.com>
There isn't a debian.dockerfile anymore,
so perform some ghost-busting.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20190923181140.7235-4-jsnow@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
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
next prev parent reply other threads:[~2019-09-26 18:52 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-26 18:35 [PULL 00/28] testing updates (docker,podman,tcg,alpha) Alex Bennée
2019-09-26 18:35 ` [PULL 01/28] target/alpha: Use array for FPCR_DYN conversion Alex Bennée
2019-09-26 18:35 ` [PULL 02/28] target/alpha: Fix SWCR_MAP_UMZ Alex Bennée
2019-09-26 18:35 ` [PULL 03/28] target/alpha: Fix SWCR_TRAP_ENABLE_MASK Alex Bennée
2019-09-26 18:35 ` [PULL 04/28] target/alpha: Handle SWCR_MAP_DMZ earlier Alex Bennée
2019-09-26 18:35 ` [PULL 05/28] target/alpha: Write to fpcr_flush_to_zero once Alex Bennée
2019-09-26 18:35 ` [PULL 06/28] target/alpha: Mask IOV exception with INV for user-only Alex Bennée
2019-09-26 18:35 ` [PULL 07/28] target/alpha: Tidy helper_fp_exc_raise_s Alex Bennée
2019-09-26 18:35 ` [PULL 08/28] target/ppc: fix signal delivery for ppc64abi32 Alex Bennée
2019-09-26 18:35 ` [PULL 09/28] tests/docker: add sanitizers back to clang build Alex Bennée
2019-10-01 7:36 ` Paolo Bonzini
2019-10-01 13:04 ` John Snow
2019-09-26 18:35 ` [PULL 10/28] tests/docker: fix DOCKER_PARTIAL_IMAGES Alex Bennée
2019-09-26 18:35 ` [PULL 11/28] tests/docker: remove python2.7 from debian9-mxe Alex Bennée
2019-09-26 18:35 ` [PULL 12/28] tests/docker: reduce scary warnings by cleaning up clean up Alex Bennée
2019-09-26 18:35 ` [PULL 13/28] podman: fix command invocation Alex Bennée
2019-09-26 18:35 ` [PULL 14/28] tests/tcg: clean-up some comments after the de-tangling Alex Bennée
2019-09-26 18:35 ` [PULL 15/28] tests/tcg: re-enable linux-test for ppc64abi32 Alex Bennée
2019-09-26 18:35 ` [PULL 16/28] tests/tcg: add float_madds test to multiarch Alex Bennée
2019-09-26 18:35 ` [PULL 17/28] tests/tcg: add generic version of float_convs Alex Bennée
2019-09-26 18:35 ` [PULL 18/28] tests/tcg: add simple record/replay smoke test for aarch64 Alex Bennée
2019-09-26 18:35 ` [PULL 19/28] configure: preserve PKG_CONFIG for subdir builds Alex Bennée
2019-09-26 18:35 ` [PULL 20/28] docs/devel: add "check-tcg" to testing.rst Alex Bennée
2019-09-26 18:35 ` [PULL 21/28] target/i386: Fix broken build with WHPX enabled Alex Bennée
2019-09-26 18:35 ` [PULL 22/28] docker: remove debian8-mxe definitions Alex Bennée
2019-09-26 18:35 ` [PULL 23/28] docker: remove unused debian8 partial image Alex Bennée
2019-09-26 18:35 ` Alex Bennée [this message]
2019-09-26 18:35 ` [PULL 25/28] docker: remove unused debian-ports Alex Bennée
2019-09-26 18:35 ` [PULL 26/28] docker: remove unused debian-sid Alex Bennée
2019-09-26 18:35 ` [PULL 27/28] docker: move tests from python2 to python3 Alex Bennée
2019-09-26 18:35 ` [PULL 28/28] tests/docker: remove debian-powerpc-user-cross Alex Bennée
2019-09-27 15:53 ` [PULL 00/28] testing updates (docker,podman,tcg,alpha) Peter Maydell
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=20190926183553.13895-25-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=fam@euphon.net \
--cc=jsnow@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@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).