opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-25 10:16:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23728 from edsantiago/makeremotesystem-cleanup

Browse Source 
Makefile: remotesystem: use real podman server, no --url
This commit is contained in:
openshift-merge-bot[bot]
2024-08-26 14:47:56 +00:00
committed by GitHub
parent b765ab96ae cae427e2f8
commit 365a7b8ecc
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -687,29 +687,32 @@ localsystem:
remotesystem: remotesystem:
# Wipe existing config, database, and cache: start with clean slate. # Wipe existing config, database, and cache: start with clean slate.
$(RM) -rf ${HOME}/.local/share/containers ${HOME}/.config/containers $(RM) -rf ${HOME}/.local/share/containers ${HOME}/.config/containers
# Start podman server using tmp socket; loop-wait for it; # . Make sure there's no active podman server - if there is,
# test podman-remote; kill server, clean up tmp socket file. # it's not us, and we have no way to know what it is.
# podman server spews copious unhelpful output; ignore it. # . Start server. Wait to make sure it comes up.
# . Run tests, pretty much the same as localsystem.
# . Stop server.
rc=0;\ rc=0;\
if timeout -v 1 true; then \ if timeout -v 1 true; then \
SOCK_FILE=$(shell mktemp --dry-run --tmpdir podman_tmp_XXXX);\ if ./bin/podman-remote info; then \
export PODMAN_SOCKET=unix://$$SOCK_FILE; \ echo "Error: podman system service (not ours) is already running" >&2;\
./bin/podman system service --timeout=0 $$PODMAN_SOCKET > $(if $(PODMAN_SERVER_LOG),$(PODMAN_SERVER_LOG),/dev/null) 2>&1 & \ exit 1;\
fi;\
./bin/podman system service --timeout=0 > $(if $(PODMAN_SERVER_LOG),$(PODMAN_SERVER_LOG),/dev/null) 2>&1 & \
retry=5;\ retry=5;\
while [ $$retry -ge 0 ]; do\ while [ $$retry -ge 0 ]; do\
echo Waiting for server...;\ echo Waiting for server...;\
sleep 1;\ sleep 1;\
./bin/podman-remote --url $$PODMAN_SOCKET info >/dev/null 2>&1 && break;\ ./bin/podman-remote info >/dev/null 2>&1 && break;\
retry=$$(expr $$retry - 1);\ retry=$$(expr $$retry - 1);\
done;\ 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;\ echo "Error: ./bin/podman system service did not come up" >&2;\
exit 1;\ exit 1;\
fi;\ fi;\
env PODMAN="$(CURDIR)/bin/podman-remote --url $$PODMAN_SOCKET" bats -T test/system/ ;\ env PODMAN="$(CURDIR)/bin/podman-remote" bats -T test/system/ ;\
rc=$$?;\ rc=$$?;\
kill %1;\ kill %1;\
rm -f $$SOCK_FILE;\
else \ else \
echo "Skipping $@: 'timeout -v' unavailable'";\ echo "Skipping $@: 'timeout -v' unavailable'";\
fi;\ fi;\