diff mbox series

[v1,09/28] tests/docker: split PARTIAL into PARTIAL and VIRTUAL images

Message ID 20211026102234.3961636-10-alex.bennee@linaro.org
State Superseded
Headers show
Series testing, plugins and gdbstub for 6.2 | expand

Commit Message

Alex Bennée Oct. 26, 2021, 10:22 a.m. UTC 
This is mostly to ensure we don't include the toolchain and bootstrap
builds in DOCKER_IMAGES which is useful when verifying all images
still build.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
 tests/docker/Makefile.include | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

-- 
2.30.2

Comments

Richard Henderson Oct. 26, 2021, 8:01 p.m. UTC | #1 
On 10/26/21 3:22 AM, Alex Bennée wrote:
> This is mostly to ensure we don't include the toolchain and bootstrap

> builds in DOCKER_IMAGES which is useful when verifying all images

> still build.

> 

> Signed-off-by: Alex Bennée<alex.bennee@linaro.org>

> ---

>   tests/docker/Makefile.include | 8 +++++---

>   1 file changed, 5 insertions(+), 3 deletions(-)


Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~
Willian Rampazzo Oct. 26, 2021, 8:52 p.m. UTC | #2 
On Tue, Oct 26, 2021 at 7:22 AM Alex Bennée <alex.bennee@linaro.org> wrote:
>

> This is mostly to ensure we don't include the toolchain and bootstrap

> builds in DOCKER_IMAGES which is useful when verifying all images

> still build.

>

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> ---

>  tests/docker/Makefile.include | 8 +++++---

>  1 file changed, 5 insertions(+), 3 deletions(-)

>


Reviewed-by: Willian Rampazzo <willianr@redhat.com>
diff mbox series

Patch

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index e943ac33b0..5bbbaceed1 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -11,8 +11,10 @@  HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m))
 DOCKER_SUFFIX := .docker
 DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
 # we don't run tests on intermediate images (used as base by another image)
-DOCKER_PARTIAL_IMAGES := debian10 debian11 debian-bootstrap empty
-DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))
+DOCKER_PARTIAL_IMAGES := debian10 debian11
+# we don't directly build virtual images (they are used to build other images)
+DOCKER_VIRTUAL_IMAGES := debian-bootstrap debian-toolchain empty
+DOCKER_IMAGES := $(sort $(filter-out $(DOCKER_VIRTUAL_IMAGES), $(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
@@ -204,7 +206,7 @@  DOCKER_PARTIAL_IMAGES += fedora-cris-cross
 # packages.
 
 # Expand all the pre-requistes for each docker image and test combination
-$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \
+$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES) $(DOCKER_VIRTUAL_IMAGES),$(DOCKER_IMAGES)), \
 	$(foreach t,$(DOCKER_TESTS), \
 		$(eval .PHONY: docker-$t@$i) \
 		$(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \