From 968981a2f04dfbd1e5386e1726e851a8b7465d8c Mon Sep 17 00:00:00 2001
From: Pietro Abate <pietro.abate@nomadic-labs.com>
Date: Tue, 18 Nov 2025 13:08:55 +0100
Subject: [PATCH] ciao: add more types of default retry

- scheduler_failure
- stale_schedule
- api_failoure
---
 .gitlab-ci.yml                                      |  3 +++
 .gitlab/ci/pipelines/base_images.yml                |  3 +++
 .gitlab/ci/pipelines/debian_repository_partial.yml  |  3 +++
 .../ci/pipelines/debian_repository_partial_auto.yml |  3 +++
 .gitlab/ci/pipelines/homebrew.yml                   |  3 +++
 .gitlab/ci/pipelines/homebrew_auto.yml              |  3 +++
 .gitlab/ci/pipelines/octez_monitoring.yml           |  3 +++
 .gitlab/ci/pipelines/rpm_repository_partial.yml     |  3 +++
 .../ci/pipelines/rpm_repository_partial_auto.yml    |  3 +++
 .gitlab/ci/pipelines/security-scans-master.yml      |  3 +++
 ci/lib_tezos_ci/tezos_ci.ml                         | 13 ++++++++++++-
 11 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dcea197e8a2f..04810e6c5c94 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -233,6 +233,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 variables:
   ci_image_name: ${GCP_REGISTRY}/${CI_PROJECT_PATH}/ci
diff --git a/.gitlab/ci/pipelines/base_images.yml b/.gitlab/ci/pipelines/base_images.yml
index 8109d231bd6d..2d85cd627772 100644
--- a/.gitlab/ci/pipelines/base_images.yml
+++ b/.gitlab/ci/pipelines/base_images.yml
@@ -8,6 +8,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 workflow:
   rules:
diff --git a/.gitlab/ci/pipelines/debian_repository_partial.yml b/.gitlab/ci/pipelines/debian_repository_partial.yml
index 451864873ce3..b545773148a3 100644
--- a/.gitlab/ci/pipelines/debian_repository_partial.yml
+++ b/.gitlab/ci/pipelines/debian_repository_partial.yml
@@ -8,6 +8,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 workflow:
   rules:
diff --git a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml
index 451864873ce3..b545773148a3 100644
--- a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml
+++ b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml
@@ -8,6 +8,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 workflow:
   rules:
diff --git a/.gitlab/ci/pipelines/homebrew.yml b/.gitlab/ci/pipelines/homebrew.yml
index a5d4a7c0eccd..a6b1c4da271f 100644
--- a/.gitlab/ci/pipelines/homebrew.yml
+++ b/.gitlab/ci/pipelines/homebrew.yml
@@ -8,6 +8,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 workflow:
   rules:
diff --git a/.gitlab/ci/pipelines/homebrew_auto.yml b/.gitlab/ci/pipelines/homebrew_auto.yml
index a5d4a7c0eccd..a6b1c4da271f 100644
--- a/.gitlab/ci/pipelines/homebrew_auto.yml
+++ b/.gitlab/ci/pipelines/homebrew_auto.yml
@@ -8,6 +8,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 workflow:
   rules:
diff --git a/.gitlab/ci/pipelines/octez_monitoring.yml b/.gitlab/ci/pipelines/octez_monitoring.yml
index 59ce852a409c..cbe80fd2b7a3 100644
--- a/.gitlab/ci/pipelines/octez_monitoring.yml
+++ b/.gitlab/ci/pipelines/octez_monitoring.yml
@@ -8,6 +8,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 workflow:
   rules:
diff --git a/.gitlab/ci/pipelines/rpm_repository_partial.yml b/.gitlab/ci/pipelines/rpm_repository_partial.yml
index 8c1d755ac508..a5594970293d 100644
--- a/.gitlab/ci/pipelines/rpm_repository_partial.yml
+++ b/.gitlab/ci/pipelines/rpm_repository_partial.yml
@@ -8,6 +8,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 workflow:
   rules:
diff --git a/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml b/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml
index 8c1d755ac508..a5594970293d 100644
--- a/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml
+++ b/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml
@@ -8,6 +8,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 workflow:
   rules:
diff --git a/.gitlab/ci/pipelines/security-scans-master.yml b/.gitlab/ci/pipelines/security-scans-master.yml
index 8db6621bc066..459606f5154c 100644
--- a/.gitlab/ci/pipelines/security-scans-master.yml
+++ b/.gitlab/ci/pipelines/security-scans-master.yml
@@ -8,6 +8,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 workflow:
   rules:
diff --git a/ci/lib_tezos_ci/tezos_ci.ml b/ci/lib_tezos_ci/tezos_ci.ml
index b6350439da50..4c3a2a003d15 100644
--- a/ci/lib_tezos_ci/tezos_ci.ml
+++ b/ci/lib_tezos_ci/tezos_ci.ml
@@ -199,9 +199,20 @@ module Pipeline = struct
       {
         image = None;
         interruptible = Some true;
+        (* Check https://docs.gitlab.com/ci/yaml/#retry for more details *)
         retry =
           Some
-            {max = 2; when_ = [Stuck_or_timeout_failure; Runner_system_failure]};
+            {
+              max = 2;
+              when_ =
+                [
+                  Stuck_or_timeout_failure;
+                  Runner_system_failure;
+                  Api_failure;
+                  Unknown_failure;
+                  Scheduler_failure;
+                ];
+            };
       }
 
   let default = function
-- 
GitLab