diff --git a/Jenkinsfile b/Jenkinsfile index fbe9cb48a4..20ea001d16 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -158,7 +158,7 @@ node { // tici tests 'onroad tests': { deviceStage("onroad", "tici-needs-can", ["SKIP_COPY=1"], [ - ["build master-ci", "cd $SOURCE_DIR/release && TARGET_DIR=$TEST_DIR ./build_devel.sh"], + ["build master-ci", "cd $SOURCE_DIR/release && TARGET_DIR=$TEST_DIR scripts/retry.sh ./build_devel.sh"], ["build openpilot", "cd selfdrive/manager && ./build.py"], ["check dirty", "release/check-dirty.sh"], ["onroad tests", "pytest selfdrive/test/test_onroad.py -s"], diff --git a/release/build_devel.sh b/release/build_devel.sh index 62496d7fec..8b6816e423 100755 --- a/release/build_devel.sh +++ b/release/build_devel.sh @@ -23,10 +23,8 @@ pre-commit uninstall || true echo "[-] bringing master-ci and devel in sync T=$SECONDS" cd $TARGET_DIR -source scripts/retry.sh - -retry git fetch --depth 1 origin master-ci -retry git fetch --depth 1 origin devel +git fetch --depth 1 origin master-ci +git fetch --depth 1 origin devel git checkout -f --track origin/master-ci git reset --hard master-ci diff --git a/scripts/retry.sh b/scripts/retry.sh index 9d62ba1cba..4861748e55 100755 --- a/scripts/retry.sh +++ b/scripts/retry.sh @@ -20,4 +20,8 @@ function retry { fi } done -} \ No newline at end of file +} + +if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then + retry "$@" +fi