diff options
author | Christophe Lyon <christophe.lyon@linaro.org> | 2019-04-02 13:49:11 +0000 |
---|---|---|
committer | Christophe Lyon <christophe.lyon@linaro.org> | 2019-04-08 13:56:44 +0000 |
commit | 5d572aec9812d72b368113eddafdd25a05c281f6 (patch) | |
tree | d070580c9b7853212c24e27b448f9e0461eb5f2d /tcwg-generate-source-cache.sh | |
parent | 52087f72581b3a99c02444b9d6ec90bab5791538 (diff) |
tcwg-generate-source-cache.sh: Use run_with_timeout_and_retry for git commands
This should hopefully make the script more resilient to git transient errors.
Change-Id: Ib4a046c9a31ec7ca23e9c9726b8c80169227376f
Diffstat (limited to 'tcwg-generate-source-cache.sh')
-rwxr-xr-x | tcwg-generate-source-cache.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tcwg-generate-source-cache.sh b/tcwg-generate-source-cache.sh index a1e3b6e9..e0ca7285 100755 --- a/tcwg-generate-source-cache.sh +++ b/tcwg-generate-source-cache.sh @@ -2,6 +2,9 @@ set -e +scripts=$(dirname $0) +. $scripts/jenkins-helpers.sh + usage () { cat <<EOF @@ -72,7 +75,7 @@ generate_abe_snapshots () local abe_temp="$(dirname "$0")/abe" rm -rf $abe_temp - git clone --branch ${abe_branch} --depth 1 https://git-us.linaro.org/toolchain/abe $abe_temp + run_with_timeout_and_retry 10m 3 git clone --branch ${abe_branch} --depth 1 https://git-us.linaro.org/toolchain/abe $abe_temp cd $abe_temp ./configure --with-local-snapshots=$snapshots_dir @@ -110,7 +113,7 @@ randomise_llvm_bobblybits () local repos="llvm clang compiler-rt lld libcxx libcxxabi libunwind lldb test-suite lnt openmp" for repo in $repos; do if [ -d "$llvm_reference/$repo" ]; then continue; fi - git clone --no-checkout "$gitroot/$repo" "$llvm_reference/$repo" + run_with_timeout_and_retry 1h 3 git clone --no-checkout "$gitroot/$repo" "$llvm_reference/$repo" done } @@ -138,7 +141,7 @@ generate_misc_files () dir=$snapshots_dir/$dir if [ ! -d $dir/.git ]; then rm -rf $dir - git clone --no-checkout $repo $dir + run_with_timeout_and_retry 1h 3 git clone --no-checkout $repo $dir fi done } @@ -155,7 +158,7 @@ update_git_repos () { repo=$(dirname "$repo_git") cd "$repo" # Update and prune local clone - git remote update -p + run_with_timeout_and_retry 1h 3 git remote update -p find -maxdepth 1 ! -name .git ! -name . -print0 \ | xargs -0 rm -rf ) |