mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/docker: add podman support

Browse Source 
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>
This commit is contained in:
Marc-André Lureau 2019-05-23 17:37:51 +02:00
parent 9459f75413
commit 05af039d1e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1157,7 +1157,7 @@ endif
@echo '' @echo ''
@echo 'Test targets:' @echo 'Test targets:'
@echo ' check - Run all tests (check-help for details)' @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 ' vm-help - Help about targets running tests inside VM'
@echo '' @echo ''
@echo 'Documentation targets:' @echo 'Documentation targets:'

8
tests/docker/Makefile.include
View File

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