intel/ci: fix gl/vk dependencies in hsw jobs

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26237>

src/gallium/drivers/crocus/ci/gitlab-ci-inc.yml

@@ -2,7 +2,6 @@
 .anholt-g41-test:
   extends:
     - .crocus-manual-rules
-    - .test-gl
   tags:
     - anholt-g41
   variables:
@@ -11,8 +10,6 @@
 
 # Manual test rules for using anholt's shared hsw.
 .anholt-hsw-test:
-  extends:
-    - .test-gl
   tags:
     - anholt-hsw
   variables:
@@ -22,6 +19,7 @@
 .crocus-g41:
   extends:
     - .anholt-g41-test
+    - .test-gl
     - .deqp-test
   variables:
     DEQP_SUITE: crocus-g41
@@ -30,6 +28,7 @@
 .crocus-g41-traces:
   extends:
     - .anholt-g41-test
+    - .test-gl
     - .piglit-traces-test
   variables:
     EGL_PLATFORM: "surfaceless"

src/gallium/drivers/crocus/ci/gitlab-ci.yml

@@ -4,6 +4,7 @@ include:
 crocus-hsw:
   extends:
     - .anholt-hsw-test
+    - .test-gl
     - .deqp-test
     - .crocus-manual-rules
   variables:
@@ -14,6 +15,7 @@ crocus-hsw:
 crocus-hsw-traces:
   extends:
     - .anholt-hsw-test
+    - .test-gl
     - .piglit-traces-test
     - .crocus-manual-rules
   variables:

src/intel/ci/gitlab-ci.yml

@@ -45,6 +45,7 @@ anv-tgl-full:
 hasvk-hsw-full:
   extends:
     - .anholt-hsw-test
+    - .test-vk
     - .deqp-test
     - .hasvk-manual-rules
   variables: