aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBrent Baude <bbaude@redhat.com>2020-05-11 12:07:42 -0500
committerBrent Baude <bbaude@redhat.com>2020-05-19 14:26:19 -0500
commit8ec08a426e7024d597281dc0af9168f340e10d5d (patch)
tree01dcb8b2a0cb42b0ed7869bf86e64a124d6ff4e6 /Makefile
parent9fe49335e0e9c11ab0b7148ba0c5d1426023d2fb (diff)
downloadpodman-8ec08a426e7024d597281dc0af9168f340e10d5d.tar.gz
podman-8ec08a426e7024d597281dc0af9168f340e10d5d.tar.bz2
podman-8ec08a426e7024d597281dc0af9168f340e10d5d.zip
v2 enable remote integration tests
enable remote integration tests Signed-off-by: Brent Baude <bbaude@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index ba23e6478..16a09fb59 100644
--- a/Makefile
+++ b/Makefile
@@ -357,14 +357,14 @@ remotesystem:
# varlink server spews copious unhelpful output; ignore it.
rc=0;\
if timeout -v 1 true; then \
- SOCK_FILE=$(shell mktemp --dry-run --tmpdir io.podman.XXXXXX);\
- export PODMAN_VARLINK_ADDRESS=unix:$$SOCK_FILE; \
- ./bin/podman varlink --timeout=0 $$PODMAN_VARLINK_ADDRESS &> $(if $(VARLINK_LOG),$(VARLINK_LOG),/dev/null) & \
+ SOCK_FILE=$(shell mktemp --dry-run --tmpdir podman.XXXXXX);\
+ export PODMAN_SOCKEY=unix:$$SOCK_FILE; \
+ ./bin/podman system service --timeout=0 $$PODMAN_VARLINK_ADDRESS &> $(if $(VARLINK_LOG),$(VARLINK_LOG),/dev/null) & \
retry=5;\
while [[ $$retry -ge 0 ]]; do\
- echo Waiting for varlink server...;\
+ echo Waiting for server...;\
sleep 1;\
- ./bin/podman-remote info &>/dev/null && break;\
+ ./bin/podman-remote --remote $(SOCK_FILE) info &>/dev/null && break;\
retry=$$(expr $$retry - 1);\
done;\
env PODMAN=./bin/podman-remote bats test/system/ ;\