From d627d18aa6e9b278b418508e2dc24b280e7b5f00 Mon Sep 17 00:00:00 2001
From: Justice Adams <107649528+justice-adams-apple@users.noreply.github.com>
Date: Fri, 7 Nov 2025 13:35:05 -0800
Subject: [PATCH 1/2] bump clone checkout to 30m

---
 zorg/jenkins/common.groovy | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/zorg/jenkins/common.groovy b/zorg/jenkins/common.groovy
index 3831c41dd..a5bf16b95 100644
--- a/zorg/jenkins/common.groovy
+++ b/zorg/jenkins/common.groovy
@@ -30,10 +30,16 @@ private def clone_llvm_project(name, sha) {
         checkout poll: false, changelog: true, scm: [
             $class: 'GitSCM',
             branches: [[name: sha ]],
-            extensions: [[
-                $class: 'CloneOption',
-                reference: '/Users/Shared/llvm-project.git'
-            ]],
+            extensions: [
+                [
+                    $class: 'CloneOption',
+                    reference: '/Users/Shared/llvm-project.git'
+                ],
+                [
+                    $class: 'CloneOption',
+                    timeout: 30
+                ]
+            ],
             userRemoteConfigs: [[url: 'https://github.com/llvm/llvm-project.git']]
         ]
     }

From 894acdfb13dfcfc990135e374c95628af6d569ec Mon Sep 17 00:00:00 2001
From: Justice Adams <107649528+justice-adams-apple@users.noreply.github.com>
Date: Fri, 7 Nov 2025 14:19:26 -0800
Subject: [PATCH 2/2] add retry mechanism

---
 zorg/jenkins/common.groovy | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/zorg/jenkins/common.groovy b/zorg/jenkins/common.groovy
index a5bf16b95..9ed1155fc 100644
--- a/zorg/jenkins/common.groovy
+++ b/zorg/jenkins/common.groovy
@@ -27,21 +27,19 @@ private def render_template(template_text, log_summary) {
 // is very space-intensive.
 private def clone_llvm_project(name, sha) {
         dir("pseudo-checkout-${name}") {
-        checkout poll: false, changelog: true, scm: [
-            $class: 'GitSCM',
-            branches: [[name: sha ]],
-            extensions: [
-                [
-                    $class: 'CloneOption',
-                    reference: '/Users/Shared/llvm-project.git'
+        retry(3) {
+            checkout poll: false, changelog: true, scm: [
+                $class: 'GitSCM',
+                branches: [[name: sha ]],
+                extensions: [
+                    [
+                        $class: 'CloneOption',
+                        timeout: 30
+                    ]
                 ],
-                [
-                    $class: 'CloneOption',
-                    timeout: 30
-                ]
-            ],
-            userRemoteConfigs: [[url: 'https://github.com/llvm/llvm-project.git']]
-        ]
+                userRemoteConfigs: [[url: 'https://github.com/llvm/llvm-project.git']]
+            ]
+        }
     }
 }