Commit 05af039d authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

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: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
parent 9459f754

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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:'

tests/docker/Makefile.include

+6 −2
Original line number Diff line number Diff line
@@ -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