From ce79b8a7994e1c530c8aea77ebb1bc513437a596 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Mon, 21 Apr 2025 22:11:04 +0200
Subject: [PATCH] radv/ci: move radv-kabini-vkd3d out of gitlab-ci-inc.yml

It's currently disabled, which is probably why it was accidentally moved there.

While at it, fix its name to match the rest of the jobs.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34710>
---
 src/amd/ci/gitlab-ci-inc.yml | 10 ----------
 src/amd/ci/gitlab-ci.yml     |  9 +++++++++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index 6c6cc36f7da..2df42dfa7ba 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -467,16 +467,6 @@
   variables:
     DEQP_SUITE: radv-valve
 
-############### vkd3d-proton
-.vkd3d-kabini-valve:
-  extends:
-    - .b2c-test-radv-vk
-    - .b2c-vkd3d-proton-test
-    - .kabini-test-valve
-    - .radv-valve-manual-rules
-  variables:
-    GPU_VERSION: radv-kabini
-
 ############### Fluster tests ###############
 .radeonsi-raven-vaapi-fluster:
   extends:
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index 11dea76a8cd..75e7af0770b 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -468,3 +468,12 @@ radv-navi31-vkd3d:
     GPU_VERSION: radv-navi31
     # Random tests fail/crash when trying to run them in parallel
     FDO_CI_CONCURRENT: 1
+
+.radv-kabini-vkd3d:
+  extends:
+    - .b2c-test-radv-vk
+    - .b2c-vkd3d-proton-test
+    - .kabini-test-valve
+    - .radv-valve-manual-rules
+  variables:
+    GPU_VERSION: radv-kabini