From 1625b5984aff6c8fea21db1ddc25c4b06a37d525 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Tue, 11 Jul 2023 17:40:34 +0100
Subject: [PATCH] ci: move broadcom files rules to
 src/broadcom/ci/gitlab-ci.yml

Signed-off-by: Eric Engestrom <eric@igalia.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24099>
---
 .gitlab-ci/test-source-dep.yml | 62 ---------------------------------
 src/broadcom/ci/gitlab-ci.yml  | 63 ++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 62 deletions(-)

diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 0652bd00f16..4ab4cbaaace 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -277,68 +277,6 @@
       - src/gallium/frontends/rusticl/**/*
       when: on_success
 
-.broadcom-common-rules:
-  rules:
-    - changes: &broadcom_file_list
-      - src/broadcom/meson.build
-      - src/broadcom/ci/**/*
-      - src/broadcom/cle/**/*
-      - src/broadcom/clif/**/*
-      - src/broadcom/common/**/*
-      - src/broadcom/compiler/**/*
-      - src/broadcom/drm-shim/**/*
-      - src/broadcom/qpu/**/*
-      - src/broadcom/simulator/**/*
-      when: on_success
-
-.vc4-rules:
-  stage: broadcom
-  rules:
-    - !reference [.igalia-farm-rules, rules]
-    - !reference [.gl-rules, rules]
-    - !reference [.broadcom-common-rules, rules]
-    - changes:
-      - src/gallium/drivers/vc4/**/*
-      - src/gallium/winsys/vc4/**/*
-      - src/gallium/auxiliary/renderonly/**/*
-      - src/gallium/winsys/kmsro/**/*
-      when: on_success
-
-.v3d-rules:
-  stage: broadcom
-  rules:
-    - !reference [.igalia-farm-rules, rules]
-    - !reference [.gl-rules, rules]
-    - !reference [.broadcom-common-rules, rules]
-    - changes: &v3d_file_list
-      - src/gallium/drivers/v3d/**/*
-      - src/gallium/winsys/v3d/**/*
-      - src/gallium/auxiliary/renderonly/**/*
-      - src/gallium/winsys/kmsro/**/*
-      when: on_success
-
-.v3d-manual-rules:
-  stage: broadcom
-  retry: !reference [.scheduled_pipeline-rules, retry]
-  rules:
-    - !reference [.igalia-farm-manual-rules, rules]
-    - !reference [.gl-manual-rules, rules]
-    - changes:
-        *broadcom_file_list
-      when: manual
-    - changes:
-        *v3d_file_list
-      when: manual
-
-.v3dv-rules:
-  stage: broadcom
-  rules:
-    - !reference [.igalia-farm-rules, rules]
-    - !reference [.vulkan-rules, rules]
-    - changes:
-      - src/broadcom/**/*
-      when: on_success
-
 .lima-rules:
   stage: arm
   rules:
diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml
index bb6535213fd..397fe66dacd 100644
--- a/src/broadcom/ci/gitlab-ci.yml
+++ b/src/broadcom/ci/gitlab-ci.yml
@@ -1,3 +1,66 @@
+.broadcom-common-rules:
+  rules:
+    - changes: &broadcom_file_list
+      - src/broadcom/meson.build
+      - src/broadcom/ci/**/*
+      - src/broadcom/cle/**/*
+      - src/broadcom/clif/**/*
+      - src/broadcom/common/**/*
+      - src/broadcom/compiler/**/*
+      - src/broadcom/drm-shim/**/*
+      - src/broadcom/qpu/**/*
+      - src/broadcom/simulator/**/*
+      when: on_success
+
+.vc4-rules:
+  stage: broadcom
+  rules:
+    - !reference [.igalia-farm-rules, rules]
+    - !reference [.gl-rules, rules]
+    - !reference [.broadcom-common-rules, rules]
+    - changes:
+      - src/gallium/drivers/vc4/**/*
+      - src/gallium/winsys/vc4/**/*
+      - src/gallium/auxiliary/renderonly/**/*
+      - src/gallium/winsys/kmsro/**/*
+      when: on_success
+
+.v3d-rules:
+  stage: broadcom
+  rules:
+    - !reference [.igalia-farm-rules, rules]
+    - !reference [.gl-rules, rules]
+    - !reference [.broadcom-common-rules, rules]
+    - changes: &v3d_file_list
+      - src/gallium/drivers/v3d/**/*
+      - src/gallium/winsys/v3d/**/*
+      - src/gallium/auxiliary/renderonly/**/*
+      - src/gallium/winsys/kmsro/**/*
+      when: on_success
+
+.v3d-manual-rules:
+  stage: broadcom
+  retry: !reference [.scheduled_pipeline-rules, retry]
+  rules:
+    - !reference [.igalia-farm-manual-rules, rules]
+    - !reference [.gl-manual-rules, rules]
+    - changes:
+        *broadcom_file_list
+      when: manual
+    - changes:
+        *v3d_file_list
+      when: manual
+
+.v3dv-rules:
+  stage: broadcom
+  rules:
+    - !reference [.igalia-farm-rules, rules]
+    - !reference [.vulkan-rules, rules]
+    - changes:
+      - src/broadcom/**/*
+      when: on_success
+
+
 .broadcom-test:
   script:
     - ./install/bare-metal/poe-powered.sh