diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-04 14:58:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-04 14:58:35 +0200 |
| commit | 6aed1076a21bc913210efd1f6ad7377dfd85a9f2 (patch) | |
| tree | 3c5e6fe3267f360704ce5b10237ce884702b16c0 /Makefile | |
| parent | 7eca5571dc9d39590bc0127f15257921dea30c55 (diff) | |
| parent | a4fcf09b7ab5daa30b37705702ba2c2e30e8f9c5 (diff) | |
| download | podman-6aed1076a21bc913210efd1f6ad7377dfd85a9f2.tar.gz podman-6aed1076a21bc913210efd1f6ad7377dfd85a9f2.tar.bz2 podman-6aed1076a21bc913210efd1f6ad7377dfd85a9f2.zip | |
Merge pull request #7111 from edsantiago/reenable_remote_system_tests
Reenable remote system tests
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -353,21 +353,19 @@ remotesystem: # Start podman server using tmp socket; loop-wait for it; # test podman-remote; kill server, clean up tmp socket file. # podman server spews copious unhelpful output; ignore it. - # FIXME FIXME FIXME: remove 'exit 0' after #6538 and #6539 are fixed - exit 0;\ rc=0;\ if timeout -v 1 true; then \ SOCK_FILE=$(shell mktemp --dry-run --tmpdir podman.XXXXXX);\ export PODMAN_SOCKET=unix:$$SOCK_FILE; \ - ./bin/podman system service --timeout=0 $$PODMAN_SOCKET &> $(if $(PODMAN_SERVER_LOG),$(PODMAN_SERVER_LOG),/dev/null) & \ + ./bin/podman system service --timeout=0 $$PODMAN_SOCKET > $(if $(PODMAN_SERVER_LOG),$(PODMAN_SERVER_LOG),/dev/null) 2>&1 & \ retry=5;\ - while [[ $$retry -ge 0 ]]; do\ + while [ $$retry -ge 0 ]; do\ echo Waiting for server...;\ sleep 1;\ - ./bin/podman-remote --url $$PODMAN_SOCKET info &>/dev/null && break;\ + ./bin/podman-remote --url $$PODMAN_SOCKET info >/dev/null 2>&1 && break;\ retry=$$(expr $$retry - 1);\ done;\ - if [[ $$retry -lt 0 ]]; then\ + if [ $$retry -lt 0 ]; then\ echo "Error: ./bin/podman system service did not come up on $$SOCK_FILE" >&2;\ exit 1;\ fi;\ |