tests/docker: add podman support

Allow to specify the container engine to run with ENGINE variable.

By default, ENGINE=auto and will select either podman or docker.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/Makefile b/Makefile
index 574fedea6bfc6daccab5fa5d5d68f7fa0d36bc47..ae17a830678244c0189e5e3cfadb68eca3334d7a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1157,7 +1157,7 @@ endif
        @echo  ''
        @echo  'Test targets:'
        @echo  '  check           - Run all tests (check-help for details)'
-       @echo  '  docker          - Help about targets running tests inside Docker containers'
+       @echo  '  docker          - Help about targets running tests inside containers'
        @echo  '  vm-help         - Help about targets running tests inside VM'
        @echo  ''
        @echo  'Documentation targets:'

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 582846a58797b5f6d27d585b51c5c9db1c61ef2d..cf535cbd196a99ef3bc1ea22e8bb26df7bef3b44 100644 (file)
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -17,7 +17,9 @@ DOCKER_TESTS := $(notdir $(shell \
 
 DOCKER_TOOLS := travis
 
-DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py
+ENGINE := auto
+
+DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py --engine $(ENGINE)
 
 TESTS ?= %
 IMAGES ?= %
@@ -146,7 +148,7 @@ $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPR
 )
 
 docker:
-       @echo 'Build QEMU and run tests inside Docker containers'
+       @echo 'Build QEMU and run tests inside Docker or Podman containers'
        @echo
        @echo 'Available targets:'
        @echo
@@ -193,6 +195,8 @@ endif
        @echo '    EXECUTABLE=<path>    Include executable in image.'
        @echo '    EXTRA_FILES="<path> [... <path>]"'
        @echo '                         Include extra files in image.'
+       @echo '    ENGINE=auto/docker/podman'
+       @echo '                         Specify which container engine to run.'
 
 # This rule if for directly running against an arbitrary docker target.
 # It is called by the expanded docker targets (e.g. make