Mesa (main): ci: Make the retry policy default for all jobs.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 7c2fe7bf4b384ccc9462fc5d037028ef88dd67b8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c2fe7bf4b384ccc9462fc5d037028ef88dd67b8

Author: Emma Anholt <emma at anholt.net>
Date:   Thu Jul  7 11:32:45 2022 -0700

ci: Make the retry policy default for all jobs.

We had to make sure to enable .ci-run-policy from every job to get the
retry, but we can just put it in the default section.

Acked-by: Michel Dänzer <mdaenzer at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17386>

---

 .gitlab-ci.yml                     | 10 ++++++----
 .gitlab-ci/container/gitlab-ci.yml | 12 ++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e59944acbfb..a5f755322af 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,12 @@ default:
       export CI_JOB_JWT="$(<${CI_JOB_JWT_FILE})" &&
       rm "${CI_JOB_JWT_FILE}"
 
+  # Retry build or test jobs up to twice when the gitlab-runner itself fails somehow.
+  retry:
+    max: 2
+    when:
+      - runner_system_failure
+
 include:
   - project: 'freedesktop/ci-templates'
     ref: 34f4ade99434043f88e164933f570301fd18b125
@@ -195,10 +201,6 @@ test-docs-mr:
       - src/**/*
       when: on_success
     # Otherwise, build/test jobs won't run because no rule matched.
-  retry:
-    max: 2
-    when:
-      - runner_system_failure
 
 
 .ci-deqp-artifacts:
diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index aba81335deb..c810693d9af 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -368,7 +368,7 @@ debian/arm_test:
 
 .windows_container_build:
   inherit:
-    default: false
+    default: [retry]
   extends:
     - .container
     - .windows-docker-vs2019
@@ -389,7 +389,7 @@ debian/arm_test:
 
 windows_vs2019:
   inherit:
-    default: false
+    default: [retry]
   extends:
     - .windows_container_build
   variables:
@@ -400,7 +400,7 @@ windows_vs2019:
 
 windows_build_vs2019:
   inherit:
-    default: false
+    default: [retry]
   extends:
     - .windows_container_build
   rules:
@@ -420,7 +420,7 @@ windows_build_vs2019:
 
 windows_test_vs2019:
   inherit:
-    default: false
+    default: [retry]
   extends:
     - .windows_container_build
   rules:
@@ -439,7 +439,7 @@ windows_test_vs2019:
 
 .use-windows_build_vs2019:
   inherit:
-    default: false
+    default: [retry]
   extends: .windows-docker-vs2019
   image: "$MESA_IMAGE"
   variables:
@@ -450,7 +450,7 @@ windows_test_vs2019:
 
 .use-windows_test_vs2019:
   inherit:
-    default: false
+    default: [retry]
   extends: .windows-docker-vs2019
   image: "$MESA_IMAGE"
   variables: