diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-09 14:33:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-09 14:33:14 -0700 |
| commit | 2bf184aa019387de560bec60636ae5152f8b54ce (patch) | |
| tree | 0a5ece519d71390567f5b139c03fb3b2b47cc339 /Makefile | |
| parent | f61e399a66c716cc6b18659e6b21208007d48848 (diff) | |
| parent | ffe726ed6438237be6c108f2ba0da10944617153 (diff) | |
| download | podman-2bf184aa019387de560bec60636ae5152f8b54ce.tar.gz podman-2bf184aa019387de560bec60636ae5152f8b54ce.tar.bz2 podman-2bf184aa019387de560bec60636ae5152f8b54ce.zip | |
Merge pull request #4222 from cevich/collect_varlink_log
Cirrus: Produce and collect varlink output
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -89,6 +89,9 @@ RELEASE_DIST_VER ?= $(shell hack/get_release_info.sh DIST_VER) RELEASE_ARCH ?= $(shell hack/get_release_info.sh ARCH) RELEASE_BASENAME := $(shell hack/get_release_info.sh BASENAME) +# If non-empty, logs all output from varlink during remote system testing +VARLINK_LOG ?= + # If GOPATH not specified, use one in the local directory ifeq ($(GOPATH),) export GOPATH := $(CURDIR)/_output @@ -274,7 +277,7 @@ remotesystem: 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 &>/dev/null & \ + ./bin/podman varlink --timeout=0 $$PODMAN_VARLINK_ADDRESS &> $(if $(VARLINK_LOG),$(VARLINK_LOG),/dev/null) & \ retry=5;\ while [[ $$retry -ge 0 ]]; do\ echo Waiting for varlink server...;\ |