CI: Collapse virgl & d3d12 stages into one

This is now called 'layered-backends'.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Acked-by: Eric Anholt <eric@anholt.net>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7873>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d3cef1105fe605889969bc6f004c61fa07e6463..78ba118f5537746a64a23a25a6a0b0cc1c465fb4 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,9 +29,8 @@ stages:
   - freedreno
   - panfrost
   - lima
-  - virgl
   - amd
-  - d3d12
+  - layered-backends
   - success
 
 # Generic rule to not run the job during scheduled pipelines
@@ -815,7 +814,7 @@ test-d3d12-windows:
   extends:
     - .build-windows
     - .use-windows_build_vs2019
-  stage: d3d12
+  stage: layered-backends
   dependencies:
     - meson-windows-vs2019
   needs:

diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 967627ee049b21460690464e9f68c377e59cc5ff..78c01f07162d3eace118ebc8c6111d652d0ccfba 100644 (file)
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -177,7 +177,7 @@
     - when: never
 
 .virgl-rules:
-  stage: virgl
+  stage: layered-backends
   rules:
     - *ignore_scheduled_pipelines
     - changes: