From f376597d00d732778c446179b13033695ebec079 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Thu, 29 Jul 2021 09:41:07 +0200
Subject: freedreno/ci: Move rules for restricted jobs to test-source-dep.yml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GitLab doesn't merge the rules array from a job that is extended, so we
were missing the changes rules.

To avoid this, create a .freedreno-rules-restricted job that includes
the changes rules and the restricted user checks.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Fixes: 92f9141f009f ("ci/freedreno: Test with non-redistributable traces")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5139
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12122>
---
 .gitlab-ci/test-source-dep.yml | 26 +++++++++++++++++++++++++-
 src/freedreno/ci/gitlab-ci.yml | 11 +----------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 752db420eed..4f6c4fb74df 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -161,7 +161,7 @@
     - changes:
         *vulkan_file_list
       when: on_success
-    - changes:
+    - changes: &freedreno_file_list
       # Note: when https://gitlab.com/gitlab-org/gitlab/-/issues/198688
       # is supported, we can change the src/freedreno/ rule to explicitly
       # exclude tools
@@ -171,6 +171,30 @@
       when: on_success
     - when: never
 
+# Unfortunately YAML doesn't let us concatenate arrays, so we have to do the
+# rules duplication manually
+.freedreno-rules-restricted:
+  stage: freedreno
+  rules:
+    # If the triggerer has access to the restricted traces and if it is pre-merge
+    - if: '($GITLAB_USER_LOGIN !~ "/^(robclark|anholt|flto|cwabbott0|Danil|tomeu)$/") &&
+           ($GITLAB_USER_LOGIN != "marge-bot" || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME)'
+      when: never
+    - *ignore_scheduled_pipelines
+    - changes:
+        *mesa_core_file_list
+      when: on_success
+    - changes:
+        *gallium_core_file_list
+      when: on_success
+    - changes:
+        *vulkan_file_list
+      when: on_success
+    - changes:
+        *freedreno_file_list
+      when: on_success
+    - when: never
+
 .panfrost-midgard-rules:
   stage: arm
   rules:
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index dd75b5aa2c2..0b15b760d8d 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -1,6 +1,3 @@
-variables:
-  PRIVATE_TRACES_COMMITTERS: "/^(robclark|anholt|flto|cwabbott0|Danil|tomeu)$/"
-
 .freedreno-test:
   extends:
     - .baremetal-test
@@ -286,14 +283,8 @@ a630-traces:
 a630-traces-restricted:
   extends:
     - a630-traces
+    - .freedreno-rules-restricted
   variables:
     PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/restricted-traces-freedreno.yml"
     PIGLIT_REPLAY_EXTRA_ARGS:  --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_host=minio-packet.freedesktop.org --minio_bucket=mesa-tracie-private --role-session-name=${CI_PROJECT_PATH}:${CI_JOB_ID} --jwt=${CI_JOB_JWT}
-  rules:
-    - if: '($GITLAB_USER_LOGIN =~ $PRIVATE_TRACES_COMMITTERS)'
-      when: on_success
-    - if: '($GITLAB_USER_LOGIN == "marge-bot") &&
-           $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME'
-      when: on_success
-    - when: never
   allow_failure: true
-- 
cgit v1.2.3