Skip to content

Commit 3e6a695

Browse files
committed
Time out docker load after 10 minutes, kill after 12 due to CI hangs.
1 parent 838e673 commit 3e6a695

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/ci/docker/run.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,10 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
7373
retry curl --max-time 600 -y 30 -Y 10 --connect-timeout 30 -f -L -C - \
7474
-o /tmp/rustci_docker_cache "$url"
7575
echo "Loading images into docker"
76-
loaded_images=$(docker load -i /tmp/rustci_docker_cache | sed 's/.* sha/sha/')
76+
# docker load sometimes hangs in the CI, so time out after 10 minutes with TERM,
77+
# KILL after 12 minutes
78+
loaded_images=$(/usr/bin/timeout -k 720 600 docker load -i /tmp/rustci_docker_cache \
79+
| sed 's/.* sha/sha/')
7780
set -e
7881
echo "Downloaded containers:\n$loaded_images"
7982
fi

0 commit comments

Comments
 (0)