From a717e18c462e5235d15f2fc1358df2df622026ba Mon Sep 17 00:00:00 2001 From: driazati Date: Thu, 11 Aug 2022 12:19:46 -0700 Subject: [PATCH] [skip ci][ci] Fix Jenkinsfile This got out of date after merging #12178 --- Jenkinsfile | 60 ++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5656f7eb5337..aa9507c17811 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,7 +45,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2022-08-10T11:53:48.439484 +// Generated at 2022-08-11T12:19:24.817346 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> @@ -862,23 +862,23 @@ stage('Build') { script: """ set -eux retry() { - local retries=\$1 + local max_retries=\$1 shift + local n=0 + local backoff_max=30 + until [ "\$n" -ge \$max_retries ] + do + "\$@" && break + n=\$((n+1)) + if [ "\$n" -eq \$max_retries ]; then + echo "failed to update after attempt \$n / \$max_retries, giving up" + exit 1 + fi - local count=0 - until "\$@"; do - exit=\$? - wait=\$((2 ** \$count)) - count=\$((\$count + 1)) - if [ \$count -lt \$retries ]; then - echo "Retry \$count/\$retries exited \$exit, retrying in \$wait seconds..." - sleep \$wait - else - echo "Retry \$count/\$retries exited \$exit, no more retries left." - return \$exit - fi + WAIT=\$(python3 -c 'import random; print(random.randint(10, 30))') + echo "failed to update \$n / \$max_retries, waiting \$WAIT to try again" + sleep \$WAIT done - return 0 } md5sum build/libtvm.so @@ -4989,23 +4989,23 @@ def run_unittest_minimal() { script: """ set -eux retry() { - local retries=\$1 + local max_retries=\$1 shift - - local count=0 - until "\$@"; do - exit=\$? - wait=\$((2 ** \$count)) - count=\$((\$count + 1)) - if [ \$count -lt \$retries ]; then - echo "Retry \$count/\$retries exited \$exit, retrying in \$wait seconds..." - sleep \$wait - else - echo "Retry \$count/\$retries exited \$exit, no more retries left." - return \$exit - fi + local n=0 + local backoff_max=30 + until [ "\$n" -ge \$max_retries ] + do + "\$@" && break + n=\$((n+1)) + if [ "\$n" -eq \$max_retries ]; then + echo "failed to update after attempt \$n / \$max_retries, giving up" + exit 1 + fi + + WAIT=\$(python3 -c 'import random; print(random.randint(10, 30))') + echo "failed to update \$n / \$max_retries, waiting \$WAIT to try again" + sleep \$WAIT done - return 0 } retry 3 aws s3 cp --no-progress s3://${s3_prefix}/cpu-minimal/build/libtvm.so build/libtvm.so