From 113e7650ae76df5315ee4b0b51d30324f39353db Mon Sep 17 00:00:00 2001 From: Justin Newberry Date: Tue, 12 Dec 2023 18:02:32 -0800 Subject: [PATCH] does this work nicely? --- Jenkinsfile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cc1ca32414..2118c4c4ed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,8 +1,7 @@ def retryWithDelay(int maxRetries, int delay, Closure body) { for (int i = 0; i < maxRetries; i++) { try { - body() - return + return body() } catch (Exception e) { sleep(delay) } @@ -102,10 +101,8 @@ def pcStage(String stageName, Closure body) { def dockerArgs = "--user=batman -v /tmp/comma_download_cache:/tmp/comma_download_cache -v /tmp/scons_cache:/tmp/scons_cache -e PYTHONPATH=${env.WORKSPACE}"; - def openpilot_base = null; - - retryWithDelay (3, 15) { - openpilot_base = docker.build("openpilot-base:build-${env.GIT_COMMIT}", "-f Dockerfile.openpilot_base .") + def openpilot_base = retryWithDelay (3, 15) { + return docker.build("openpilot-base:build-${env.GIT_COMMIT}", "-f Dockerfile.openpilot_base .") } openpilot_base.inside(dockerArgs) {