summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-05-20 01:45:00 +0200
committerGitHub <noreply@github.com>2020-05-20 01:45:00 +0200
commit4eee0d840f0af81560d89864ea64b95c9e70b18d (patch)
tree684b0400d186ef9f6c20314a951f10ecec185bae /Makefile
parent0f8ad039235137d086b9fea33bb74b362e625cdd (diff)
parent8ec08a426e7024d597281dc0af9168f340e10d5d (diff)
downloadpodman-4eee0d840f0af81560d89864ea64b95c9e70b18d.tar.gz
podman-4eee0d840f0af81560d89864ea64b95c9e70b18d.tar.bz2
podman-4eee0d840f0af81560d89864ea64b95c9e70b18d.zip
Merge pull request #6177 from baude/v2enableremote
v2 enable remote integration tests
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/ ;\