[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 6/6] tests/docker/Makefile.include: expand docke
From: |
Fam Zheng |
Subject: |
Re: [Qemu-devel] [PATCH 6/6] tests/docker/Makefile.include: expand docker help text |
Date: |
Mon, 31 Oct 2016 10:34:23 +0800 |
User-agent: |
Mutt/1.7.1 (2016-10-04) |
On Fri, 10/28 17:33, Alex Bennée wrote:
> No we can query what has and hasn't been built we can make this list
> available in the help text. This is useful as some of the bootstrapped
> builds can take some time to build.
I'm not sure how useful it is to list built images without checking if it's in
sync with the dockerfile: we still rebuild outdated ones even they're built.
>
> Signed-off-by: Alex Bennée <address@hidden>
> ---
> tests/docker/Makefile.include | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index bb9e078..a19991b 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -80,6 +80,10 @@ docker-image-debian-%:
> $(DOCKER_FILES_DIR)/debian-bootstrap.docker
> --include-executable=$(QEMU_EXEC),\
> "BUILD USER","$*")
>
> +DOCKER_USER_IMAGES := debian-stable-armhf debian-stable-arm64
> +DOCKER_BUILT_IMAGES := $(shell $(SRC_PATH)/tests/docker/docker.py images
> --repo qemu)
> +DOCKER_UNBUILT_IMAGES := $(filter-out debian-bootstrap, $(filter-out
> $(DOCKER_BUILT_IMAGES), $(DOCKER_USER_IMAGES) $(DOCKER_IMAGES)))
> +
> docker:
> @echo 'Build QEMU and run tests inside Docker containers'
> @echo
> @@ -96,8 +100,11 @@ docker:
> @echo ' docker-image-IMAGE: Build image "IMAGE".'
> @echo ' docker-run: For manually running a "TEST" with
> "IMAGE"'
> @echo
> - @echo 'Available container images:'
> - @echo ' $(DOCKER_IMAGES)'
> + @echo 'Available built container images:'
> + @echo ' $(DOCKER_BUILT_IMAGES)'
> + @echo
> + @echo 'Available (but unbuilt) container images:'
> + @echo ' $(DOCKER_UNBUILT_IMAGES)'
> @echo
> @echo 'Available tests:'
> @echo ' $(DOCKER_TESTS)'
> --
> 2.10.1
>
>
- [Qemu-devel] [PATCH 0/6] Expand the building of qemu-user docker images, Alex Bennée, 2016/10/28
- [Qemu-devel] [PATCH 1/6] tests/docker/Makefile.include: fix diff-index call, Alex Bennée, 2016/10/28
- [Qemu-devel] [PATCH 6/6] tests/docker/Makefile.include: expand docker help text, Alex Bennée, 2016/10/28
- Re: [Qemu-devel] [PATCH 6/6] tests/docker/Makefile.include: expand docker help text,
Fam Zheng <=
- [Qemu-devel] [PATCH 4/6] tests/docker/Makefile: Add a rule for Debian user images, Alex Bennée, 2016/10/28
- [Qemu-devel] [PATCH 5/6] tests/docker/docker.py: expand images command, Alex Bennée, 2016/10/28
- [Qemu-devel] [PATCH 3/6] tests/docker: add optional libs to travis.docker, Alex Bennée, 2016/10/28
- [Qemu-devel] [PATCH 2/6] tests/docker/test-user: a simple linux-user test, Alex Bennée, 2016/10/28
- Re: [Qemu-devel] [PATCH 0/6] Expand the building of qemu-user docker images, Fam Zheng, 2016/10/30