[CI] Don't retry steps after a build has been aborted or timed out (e…

…lastic#96600) (elastic#96650) Co-authored-by: Brian Seeders <[email protected]>
nreese · Apr 8, 2021 · e5d40af · e5d40af
1 parent a24e517
commit e5d40af
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/vars/retryable.groovy b/vars/retryable.groovy
@@ -48,7 +48,10 @@ def call(label, Closure closure) {
 
   try {
     closure()
-  } catch (ex) {
+  } catch (org.jenkinsci.plugins.workflow.steps.FlowInterruptedException ex) {
+    // If the build was aborted, don't retry the step
+    throw ex
+  } catch (Exception ex) {
     if (haveReachedMaxRetries()) {
       print "Couldn't retry '${label}', have already reached the max number of retries for this build."
       throw ex