docker: Don't enable networking as a side-effect of DEBUG=1

When trying to debug problems with tests it is natural to set
DEBUG=1 when starting the docker environment. Unfortunately
this has a side-effect of enabling an eth0 network interface
in the container, which changes the operating environment of
the test suite. IOW tests with fail may suddenly start
working again if DEBUG=1 is set, due to changed network setup.

Add a separate NETWORK variable to allow enablement of
networking separately from DEBUG=1. This can be used in two
ways. To enable the default docker network backend

  make docker-test-build@fedora NETWORK=1

while to enable a specific network backend, eg join the network
associated with the container 'wibble':

  make docker-test-build@fedora NETWORK=container:wibble

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <20170713144352.2212-1-berrange@redhat.com>
[Drop the superfluous second $(subst ...). - Fam]
Signed-off-by: Fam Zheng <famz@redhat.com>

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 037cb9e9e777b8afc87f185a7d9f00a9e925e8f9..012a2fc1af0e93d54b2f799f41f8d59b67e6f8ed 100644 (file)
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -106,6 +106,8 @@ docker:
        @echo '                         (default is 1)'
        @echo '    DEBUG=1              Stop and drop to shell in the created container'
        @echo '                         before running the command.'
+       @echo '    NETWORK=1            Enable virtual network interface with default backend.'
+       @echo '    NETWORK=$BACKEND     Enable virtual network interface with $BACKEND.'
        @echo '    NOUSER               Define to disable adding current user to containers passwd.'
        @echo '    NOCACHE=1            Ignore cache when build images.'
        @echo '    EXECUTABLE=<path>    Include executable in image.'
@@ -132,7 +134,8 @@ docker-run: docker-qemu-src
                $(SRC_PATH)/tests/docker/docker.py run                  \
                        $(if $(NOUSER),,-u $(shell id -u)) -t           \
                        $(if $V,,--rm)                                  \
-                       $(if $(DEBUG),-i,--net=none)                    \
+                       $(if $(DEBUG),-i,)                              \
+                       $(if $(NETWORK),$(if $(subst $(NETWORK),,1),--net=$(NETWORK)),--net=none) \
                        -e TARGET_LIST=$(TARGET_LIST)                   \
                        -e EXTRA_CONFIGURE_OPTS="$(EXTRA_CONFIGURE_OPTS)" \
                        -e V=$V -e J=$J -e DEBUG=$(DEBUG)               \