[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/6] tests/docker: add podman support
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL 3/6] tests/docker: add podman support |
Date: |
Thu, 22 Aug 2019 17:47:22 +0400 |
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 <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
---
Makefile | 2 +-
tests/docker/Makefile.include | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 574fedea6b..ae17a83067 100644
--- 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 582846a587..cf535cbd19 100644
--- 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
--
2.23.0
- [Qemu-devel] [PULL 0/6] Podman patches, Marc-André Lureau, 2019/08/22
- [Qemu-devel] [PULL 1/6] docker.py: add --run-as-current-user, Marc-André Lureau, 2019/08/22
- [Qemu-devel] [PULL 3/6] tests/docker: add podman support,
Marc-André Lureau <=
- [Qemu-devel] [PULL 2/6] docker.py: add podman support, Marc-André Lureau, 2019/08/22
- [Qemu-devel] [PULL 4/6] tests: specify the address family when checking bind, Marc-André Lureau, 2019/08/22
- [Qemu-devel] [PULL 5/6] test-char: skip tcp tests if ipv4 check failed, Marc-André Lureau, 2019/08/22
- [Qemu-devel] [PULL 6/6] test: skip tests if socket_check_protocol_support() failed, Marc-André Lureau, 2019/08/22
- Re: [Qemu-devel] [PULL 0/6] Podman patches, Peter Maydell, 2019/08/23