From 6f7a0ae58b843290ae2006dfd9aa1e8fd86053a5 Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Fri, 9 Jun 2023 16:58:37 +0200 Subject: [PATCH] ci: Use podman stop over podman kill This should avoid a race where the kill is not done when spinning up the new container. podman stop waits 10 seconds by default. Github-Pull: #27844 Rebased-From: faaa62754e84417baa917f20db379db78146687d --- ci/test/04_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index e1e4120b691..9237ea443b2 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -40,7 +40,7 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then if [ -n "${RESTART_CI_DOCKER_BEFORE_RUN}" ] ; then echo "Restart docker before run to stop and clear all containers started with --rm" - podman container kill --all # Similar to "systemctl restart docker" + podman container stop --all # Similar to "systemctl restart docker" echo "Prune all dangling images" docker image prune --force fi