From e2efb4cfdffafb5180a9a27e1f8025f1ffba2dbe Mon Sep 17 00:00:00 2001 From: David Galloway Date: Tue, 16 Dec 2025 13:14:46 -0500 Subject: [PATCH] setup_container_runtime: Move rm -f ceph_build after perms fix We need to fix permissions first then delete the container if there were root-owned layers left over Signed-off-by: David Galloway --- scripts/setup_container_runtime.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/setup_container_runtime.sh b/scripts/setup_container_runtime.sh index 7100b5b9..4f6fb299 100755 --- a/scripts/setup_container_runtime.sh +++ b/scripts/setup_container_runtime.sh @@ -26,13 +26,6 @@ function setup_container_runtime () { fi if command -v podman; then - - # remove any leftover containers that might be present because of - # bad exits from podman (like an oom kill or something). - # We've observed new jobs failing to run because they can't create - # a container named ceph_build - podman rm -f ceph_build - if [ "$(podman version -f "{{ lt .Client.Version \"5.6.1\" }}")" = "true" ] && \ ! echo "928238bfcdc79a26ceb51d7d9759f99144846c0a /etc/tmpfiles.d/podman.conf" | sha1sum --status --check -; then # Pull in this fix: https://github.com/containers/podman/pull/26986 @@ -66,6 +59,11 @@ function setup_container_runtime () { fi fi fi + # remove any leftover containers that might be present because of + # bad exits from podman (like an oom kill or something). + # We've observed new jobs failing to run because they can't create + # a container named ceph_build + podman rm -f ceph_build fi } -- 2.47.3