From: "Alex Bennée" <alex.bennee@linaro.org>
To: cota@braap.org, famz@redhat.com, berrange@redhat.com,
f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com,
aurelien@aurel32.net, agraf@suse.de
Cc: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>
Subject: [Qemu-devel] [PATCH v2 for 3.0 08/16] docker: Makefile.include don't include partial images
Date: Fri, 13 Jul 2018 13:17:33 +0100 [thread overview]
Message-ID: <20180713121741.19262-9-alex.bennee@linaro.org> (raw)
In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org>
Rename DOCKER_INTERMEDIATE_IMAGES to DOCKER_PARTIAL_IMAGES and add the
incomplete cross compiler images that can build tests but can't build
QEMU itself. We also add debian, debian-bootstrap and the tricode
images to the list.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/docker/Makefile.include | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index b2a7e761cc..09fb7db7fa 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -6,7 +6,7 @@ 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_INTERMEDIATE_IMAGES := debian8 debian9 debian8-mxe debian-ports debian-sid
+DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian8-mxe debian-ports debian-sid debian-bootstrap
DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_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
@@ -121,6 +121,11 @@ docker-image-travis: NOUSER=1
# Specialist build images, sometimes very limited tools
docker-image-tricore-cross: docker-image-debian9
+# These images may be good enough for building tests but not for test builds
+DOCKER_PARTIAL_IMAGES += debian-alpha-cross debian-hppa-cross debian-m68k-cross debian-sh4-cross
+DOCKER_PARTIAL_IMAGES += debian-sparc64-cross debian-mips64-cross debian-riscv64-cross
+DOCKER_PARTIAL_IMAGES += debian-tricore-cross debian-powerpc-cross fedora-i386-cross
+
# Rules for building linux-user powered images
#
# These are slower than using native cross compiler setups but can
@@ -137,7 +142,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_INTERMEDIATE_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \
+$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \
$(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \
$(eval .PHONY: docker-$t@$i) \
$(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \
--
2.17.1
next prev parent reply other threads:[~2018-07-13 12:17 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-13 12:17 [Qemu-devel] [PATCH v2 for 3.0 00/16] various docker fixes Alex Bennée
2018-07-13 12:17 ` [Qemu-devel] [PATCH v2 for 3.0 01/16] tests/.gitignore: don't ignore docker tests Alex Bennée
2018-07-13 12:17 ` [Qemu-devel] [PATCH v2 for 3.0 02/16] docker: base debian-tricore on qemu:debian9 Alex Bennée
2018-07-17 14:49 ` Philippe Mathieu-Daudé
2018-07-13 12:17 ` [Qemu-devel] [PATCH v2 for 3.0 03/16] shippable: Build the TriCore docker image Alex Bennée
2018-07-13 13:27 ` Alex Bennée
2018-07-17 2:55 ` Philippe Mathieu-Daudé
2018-07-13 12:17 ` [Qemu-devel] [PATCH v2 for 3.0 04/16] docker: fail more gracefully on docker.py check Alex Bennée
2018-07-13 12:17 ` [Qemu-devel] [PATCH v2 for 3.0 05/16] docker: split configure_qemu from build_qemu Alex Bennée
2018-07-17 2:50 ` Philippe Mathieu-Daudé
2018-07-13 12:17 ` [Qemu-devel] [PATCH v2 for 3.0 06/16] docker: move make check into check_qemu helper Alex Bennée
2018-07-17 3:00 ` Philippe Mathieu-Daudé
2018-07-17 9:59 ` Alex Bennée
2018-07-17 14:56 ` Philippe Mathieu-Daudé
2018-07-13 12:17 ` [Qemu-devel] [PATCH v2 for 3.0 07/16] docker: gracefully skip check_qemu Alex Bennée
2018-07-17 3:02 ` Philippe Mathieu-Daudé
2018-07-17 10:22 ` Alex Bennée
2018-07-17 15:05 ` Philippe Mathieu-Daudé
2018-07-13 12:17 ` Alex Bennée [this message]
2018-07-17 3:07 ` [Qemu-devel] [PATCH v2 for 3.0 08/16] docker: Makefile.include don't include partial images Philippe Mathieu-Daudé
2018-07-13 12:17 ` [Qemu-devel] [PATCH v2 for 3.0 09/16] docker: disable debian-powerpc-user-cross Alex Bennée
2018-07-17 15:52 ` Philippe Mathieu-Daudé
2018-07-13 12:17 ` [Qemu-devel] [PATCH v2 for 3.0 10/16] docker: add test-unit runner Alex Bennée
2018-07-17 3:37 ` Philippe Mathieu-Daudé
2018-07-13 12:17 ` [Qemu-devel] [PATCH v2 for 3.0 11/16] docker: add expansion for docker-test-FOO to Makefile.include Alex Bennée
2018-07-16 1:42 ` Philippe Mathieu-Daudé
2018-07-16 9:07 ` Alex Bennée
2018-07-17 15:03 ` Philippe Mathieu-Daudé
2018-07-13 12:17 ` [Qemu-devel] [PATCH v2 for 3.0 12/16] docker: drop QEMU_TARGET check, fallback in EXECUTABLE not set Alex Bennée
2018-07-17 15:51 ` Philippe Mathieu-Daudé
2018-07-13 12:17 ` [Qemu-devel] [PATCH v2 for 3.0 13/16] docker: add --hint to docker.py check Alex Bennée
2018-07-17 3:24 ` Philippe Mathieu-Daudé
2018-07-17 15:14 ` Philippe Mathieu-Daudé
2018-07-13 12:17 ` [Qemu-devel] [PATCH v2 for 3.0 14/16] docker: Update debootstrap script after Debian migration from Alioth to Salsa Alex Bennée
2018-07-13 12:17 ` [Qemu-devel] [PATCH v2 for 3.0 15/16] docker: add commentary to debian-bootstrap.docker Alex Bennée
2018-07-17 15:02 ` Philippe Mathieu-Daudé
2018-07-13 12:17 ` [Qemu-devel] [PATCH v2 for 3.0 16/16] docker: ignore distro versioning of debootstrap Alex Bennée
2018-07-17 15:52 ` Philippe Mathieu-Daudé
2018-07-17 16:02 ` [Qemu-devel] [PATCH v2 for 3.0 00/16] various docker fixes Philippe Mathieu-Daudé
2018-07-17 18:53 ` Alex Bennée
2018-07-17 20:28 ` Philippe Mathieu-Daudé
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=20180713121741.19262-9-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=agraf@suse.de \
--cc=aurelien@aurel32.net \
--cc=balrogg@gmail.com \
--cc=berrange@redhat.com \
--cc=cota@braap.org \
--cc=f4bug@amsat.org \
--cc=famz@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.