fix: retry bootstrap image imports

2026-04-26 09:43:31 +00:00
parent a6a630000a
commit daf6ccd0e4
1 changed files with 10 additions and 1 deletions
@@ -533,7 +533,16 @@ jobs:
            scp -i "$HOME/.ssh/id_ed25519" -o StrictHostKeyChecking=no -o ConnectTimeout=10 \
              "${archive_path}" "ubuntu@${host_ip}:/tmp/${archive_name}"
            ssh -i "$HOME/.ssh/id_ed25519" -o StrictHostKeyChecking=no -o ConnectTimeout=10 "ubuntu@${host_ip}" \
-              "sudo k3s ctr -n k8s.io images import '/tmp/${archive_name}' && sudo k3s crictl inspecti '${image}' >/dev/null"
+              "set -euo pipefail; \
+              if sudo k3s crictl inspecti '${image}' >/dev/null 2>&1; then exit 0; fi; \
+              for attempt in 1 2 3 4 5; do \
+                echo 'Importing ${image} archive with ctr'; \
+                if sudo k3s ctr -n k8s.io images import '/tmp/${archive_name}' && sudo k3s crictl inspecti '${image}' >/dev/null; then exit 0; fi; \
+                sleep 10; \
+              done; \
+              sudo systemctl status k3s --no-pager -l || true; \
+              sudo journalctl -u k3s -n 80 --no-pager || true; \
+              exit 1"
          }

          eso_diagnostics() {