From 5eea8f6fe8a5c9eaefbac4f3bbede9a2c346ad10 Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Thu, 13 Feb 2025 09:22:06 +0100
Subject: [PATCH] intel/ci: Fix manual rules for ANGLE jobs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Disable auto-retry for .intel-manual-rules to prevent unnecessary reruns
and switch ANGLE jobs from this rule to .anv-manual-rules, as there’s no
point in running anv-on-angle jobs on iris changes.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33513>
---
 src/intel/ci/gitlab-ci-inc.yml | 1 +
 src/intel/ci/gitlab-ci.yml     | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/intel/ci/gitlab-ci-inc.yml b/src/intel/ci/gitlab-ci-inc.yml
index 7f88d067ba5..e616d3a3bac 100644
--- a/src/intel/ci/gitlab-ci-inc.yml
+++ b/src/intel/ci/gitlab-ci-inc.yml
@@ -191,6 +191,7 @@
 
 .intel-manual-rules:
   stage: intel-postmerge
+  extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
     - !reference [.iris-manual-rules, rules]
diff --git a/src/intel/ci/gitlab-ci.yml b/src/intel/ci/gitlab-ci.yml
index aaf86ce9688..bfecbe15541 100644
--- a/src/intel/ci/gitlab-ci.yml
+++ b/src/intel/ci/gitlab-ci.yml
@@ -89,7 +89,7 @@ anv-jsl-angle:
 anv-jsl-angle-full:
   extends:
     - anv-jsl-angle
-    - .intel-manual-rules
+    - .anv-manual-rules
   variables:
     DEQP_SUITE: anv-jsl-angle-full
   parallel: 2
@@ -107,7 +107,7 @@ anv-adl-angle:
 anv-adl-angle-full:
   extends:
     - anv-adl-angle
-    - .intel-manual-rules
+    - .anv-manual-rules
   variables:
     DEQP_SUITE: anv-adl-angle-full
   timeout: 30m
@@ -125,7 +125,7 @@ anv-tgl-angle:
 anv-tgl-angle-full:
   extends:
     - anv-tgl-angle
-    - .intel-manual-rules
+    - .anv-manual-rules
   variables:
     DEQP_SUITE: anv-tgl-angle-full
   parallel: null