From b970e25890ff45a4a705f8a6d7849cc5310a2326 Mon Sep 17 00:00:00 2001
From: David Heidelberg <david.heidelberg@collabora.com>
Date: Fri, 21 Oct 2022 00:38:21 +0200
Subject: [PATCH] ci/panfrost: deduplicate gitlab-ci.yml

Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19211>
---
 src/panfrost/ci/gitlab-ci.yml | 58 ++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/src/panfrost/ci/gitlab-ci.yml b/src/panfrost/ci/gitlab-ci.yml
index 986640677ee..2bd8f0462e6 100644
--- a/src/panfrost/ci/gitlab-ci.yml
+++ b/src/panfrost/ci/gitlab-ci.yml
@@ -4,6 +4,28 @@
     PAN_MESA_DEBUG: sync
     HWCI_FREQ_MAX: "true"
 
+.panfrost-traces:
+  variables:
+    PAN_MESA_DEBUG: "deqp,sync"
+    MESA_GLES_VERSION_OVERRIDE: "3.1"
+    MESA_GL_VERSION_OVERRIDE: "3.3"
+    MESA_GLSL_VERSION_OVERRIDE: 330
+    EGL_PLATFORM: surfaceless
+    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-panfrost.yml"
+    PIGLIT_REPLAY_EXTRA_ARGS: --keep-image
+
+.lava-rk3288-veyron-jaq:
+  variables:
+    BOOT_METHOD: depthcharge
+    DEVICE_TYPE: rk3288-veyron-jaq
+    DEQP_SUITE: panfrost-t760
+    DRIVER_NAME: panfrost
+    DTB: $DEVICE_TYPE
+    GPU_VERSION: panfrost-t760
+    KERNEL_IMAGE_TYPE: ""
+    FDO_CI_CONCURRENT: 6
+    RUNNER_TAG: mesa-ci-x86-64-lava-rk3288-veyron-jaq
+
 panfrost-t720-gles2:arm64:
   extends:
     - .lava-test:arm64
@@ -22,36 +44,15 @@ panfrost-t720-gles2:arm64:
     - .lava-test:armhf
     - .panfrost-midgard-rules
     - .panfrost-test
-  variables:
-    DEVICE_TYPE: rk3288-veyron-jaq
-    DTB: $DEVICE_TYPE
-    GPU_VERSION: panfrost-t760
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-    DEQP_SUITE: panfrost-t760
-    FDO_CI_CONCURRENT: 6
-    RUNNER_TAG: mesa-ci-x86-64-lava-rk3288-veyron-jaq
+    - .lava-rk3288-veyron-jaq
 
 .panfrost-t760-traces:armhf:
   extends:
     - .lava-piglit-traces:armhf
     - .panfrost-midgard-rules
     - .panfrost-test
-  variables:
-    DEVICE_TYPE: rk3288-veyron-jaq
-    DTB: $DEVICE_TYPE
-    GPU_VERSION: panfrost-t760
-    DRIVER_NAME: panfrost
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-    PAN_MESA_DEBUG: "deqp,sync"
-    MESA_GLES_VERSION_OVERRIDE: "3.1"
-    MESA_GL_VERSION_OVERRIDE: "3.3"
-    MESA_GLSL_VERSION_OVERRIDE: 330
-    EGL_PLATFORM: surfaceless
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-panfrost.yml"
-    PIGLIT_REPLAY_EXTRA_ARGS: "--keep-image"
-    RUNNER_TAG: mesa-ci-x86-64-lava-rk3288-veyron-jaq
+    - .lava-rk3288-veyron-jaq
+    - .panfrost-traces
 
 .lava-rk3399-gru-kevin:
   extends:
@@ -79,14 +80,7 @@ panfrost-t860-traces:arm64:
   extends:
     - .lava-piglit-traces:arm64
     - .lava-rk3399-gru-kevin
-  variables:
-    PAN_MESA_DEBUG: "deqp,sync"
-    MESA_GLES_VERSION_OVERRIDE: "3.1"
-    MESA_GL_VERSION_OVERRIDE: "3.3"
-    MESA_GLSL_VERSION_OVERRIDE: 330
-    EGL_PLATFORM: surfaceless
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-panfrost.yml"
-    PIGLIT_REPLAY_EXTRA_ARGS: --keep-image
+    - .panfrost-traces
 
 .lava-meson-g12b-a311d-khadas-vim3:
   extends: