diff options
| author | Hans Kratz <hans@appfour.com> | 2021-10-21 22:52:00 +0200 |
|---|---|---|
| committer | Hans Kratz <hans@appfour.com> | 2021-10-21 23:07:23 +0200 |
| commit | 3e6a69534f52b08057d18643b62d0f926b80909f (patch) | |
| tree | b26b94e69a69e03a8add6cfb716ce022f1916453 | |
| parent | 838e673d3b767c32dd54a3d8fee3c9caa65caa68 (diff) | |
| download | rust-3e6a69534f52b08057d18643b62d0f926b80909f.tar.gz rust-3e6a69534f52b08057d18643b62d0f926b80909f.zip | |
Time out docker load after 10 minutes, kill after 12 due to CI hangs.
| -rwxr-xr-x | src/ci/docker/run.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index b9b6add99f8..b1dacf79d26 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -73,7 +73,10 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then retry curl --max-time 600 -y 30 -Y 10 --connect-timeout 30 -f -L -C - \ -o /tmp/rustci_docker_cache "$url" echo "Loading images into docker" - loaded_images=$(docker load -i /tmp/rustci_docker_cache | sed 's/.* sha/sha/') + # docker load sometimes hangs in the CI, so time out after 10 minutes with TERM, + # KILL after 12 minutes + loaded_images=$(/usr/bin/timeout -k 720 600 docker load -i /tmp/rustci_docker_cache \ + | sed 's/.* sha/sha/') set -e echo "Downloaded containers:\n$loaded_images" fi |