From d0d3924c6050d8aeb88ed0eecf46928f0a4657fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Roukala=20=28n=C3=A9=20Peres=29?=
 <martin.roukala@mupuf.org>
Date: Fri, 24 May 2024 09:34:31 +0300
Subject: [PATCH] nvk+zink/ci: rename the ga106 jobs to be more in line with
 RADV
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It also has the benefit of being a shorter name than the original.

Signed-off-by: Martin Roukala (né Peres) <martin.roukala@mupuf.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29381>
---
 src/gallium/drivers/zink/ci/gitlab-ci-inc.yml |  2 +-
 src/gallium/drivers/zink/ci/gitlab-ci.yml     | 23 +++++++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
index 9d03f3bea46..e13169229f5 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
@@ -176,7 +176,7 @@
     VK_DRIVER: intel
     GPU_VERSION: zink-anv-tgl
 
-.zink-nvk-glcts-piglit-valve:
+.zink-nvk-test-valve:
   extends:
     - .b2c-x86_64-test-gl
     - .nvk-vkcts
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index d18d4d552b0..aa2b1179e77 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -81,17 +81,6 @@ zink-anv-tgl-traces-restricted:
     PIGLIT_REPLAY_EXTRA_ARGS: --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=${S3_TRACIE_PRIVATE_BUCKET} --jwt-file=${S3_JWT_FILE}
   allow_failure: true
 
-zink-nvk-ga106-glcts-piglit-valve:
-  extends:
-    - .zink-nvk-glcts-piglit-valve
-    - .zink-nvk-manual-rules
-    - .nvk-ga106-valve
-  timeout: 45m  # job runtime 29min, test runtime 27min
-  variables:
-    GPU_VERSION: zink-nvk
-    B2C_TIMEOUT_BOOT_MINUTES: 35
-    B2C_TIMEOUT_OVERALL_MINUTES: 40
-
 zink-tu-a618:
   extends:
     - .lava-test-deqp:arm64
@@ -150,8 +139,18 @@ zink-tu-a750:
     GPU_VERSION: zink-tu-a750
     HWCI_START_WESTON: 1
 
+############### Combined testing (GL, GLES, Piglit) on NVK / RADV
+zink-nvk-ga106-valve:
+  timeout: 45m
+  extends:
+    - .zink-nvk-test-valve
+    - .zink-nvk-manual-rules
+    - .nvk-ga106-valve
+  variables:
+    GPU_VERSION: zink-nvk
+    B2C_TIMEOUT_BOOT_MINUTES: 35
+    B2C_TIMEOUT_OVERALL_MINUTES: 40  # usual run time: 26min
 
-############### Combined testing (GL, GLES, Piglit) on RADV
 zink-radv-polaris10-valve:
   extends:
     - .radv-zink-test-valve