On 19/07/2016 16:31, Fam Zheng wrote:
> Image building targets are dependencies of test running targets, so when
> a docker image doesn't exist, it means it's skipped (due to dependency
> checks in pre script). Therefore, skip the test too.
>
> Signed-off-by: Fam Zheng <f...@redhat.com>
> Message-id: 1468934445-32183-10-git-send-email-f...@redhat.com
> ---
> tests/docker/Makefile.include | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index c5546ee..e7f0023 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -105,7 +105,10 @@ docker-run-%: docker-qemu-src
> fi
> $(if $(filter $(TESTS),$(CMD)),$(if $(filter $(IMAGES),$(IMAGE)), \
> $(call quiet-command,\
> - $(SRC_PATH)/tests/docker/docker.py run $(if $V,,--rm) \
> + if $(SRC_PATH)/tests/docker/docker.py images \
> + --format={{.Repository}}:{{.Tag}} | \
> + grep -qx qemu:$(IMAGE); then \
> + $(SRC_PATH)/tests/docker/docker.py run $(if
> $V,,--rm) \
> -t \
> $(if $(DEBUG),-i,--net=none) \
> -e TARGET_LIST=$(TARGET_LIST) \
> @@ -117,6 +120,7 @@ docker-run-%: docker-qemu-src
> qemu:$(IMAGE) \
> /var/tmp/qemu/run \
> $(CMD); \
> + fi \
> , " RUN $(CMD) in $(IMAGE)")))
>
> docker-clean:
>
This breaks the version of Docker in RHEL7.2, which doesn't have
--format. Is it possible to revert it?
Paolo
