fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 13:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci: Move r300/nine/nvk builds out of critical path

Browse source 
debian-testing is the critical path: the shortest possible job to build
exactly what we need to execute on hardware, and nothing else.

debian-build-testing exists to give us better coverage at the expense of
running longer.

Since the only jobs using r300 and Nine, and the only jobs using NVK,
are in post-merge stages which are manually triggered, move these builds
to debian-build-testing. This makes the critical path to those a little
longer, but we do get to make it shorter for everyone else just running
regular Marge jobs.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Eric Engestrom <None>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33287>
This commit is contained in:
Daniel Stone 2025-01-29 10:46:16 +00:00 • committed by Marge Bot
parent eabc365e95
commit 5b291c7ce6
4 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.gitlab-ci/build/gitlab-ci.yml
View file

@ -105,11 +105,11 @@ debian-testing:
-D glx=dri
-D platforms=x11,wayland
GALLIUM_ST: >
-D gallium-nine=true
-D gallium-nine=false
-D gallium-rusticl=true
-D gallium-va=enabled
GALLIUM_DRIVERS: "llvmpipe,softpipe,virgl,radeonsi,zink,iris,r300,svga"
VULKAN_DRIVERS: "swrast,amd,intel,virtio,nouveau"
GALLIUM_DRIVERS: "llvmpipe,softpipe,virgl,radeonsi,zink,iris,svga"
VULKAN_DRIVERS: "swrast,amd,intel,virtio"
BUILDTYPE: "debugoptimized"
EXTRA_OPTION: >
-D intel-elk=false
@ -251,10 +251,11 @@ debian-build-testing:
-D gallium-vdpau=enabled
-D gallium-va=enabled
-D gallium-xa=enabled
-D gallium-nine=false
-D gallium-nine=true
-D gallium-rusticl=false
GALLIUM_DRIVERS: "i915,iris,nouveau,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus"
VULKAN_DRIVERS: "swrast,intel_hasvk,imagination-experimental,microsoft-experimental"
VULKAN_DRIVERS: "intel_hasvk,imagination-experimental,microsoft-experimental,nouveau,swrast"
BUILD_TYPE: "debugoptimized"
EXTRA_OPTION: >
-D spirv-to-dxil=true
-D osmesa=true

18
.gitlab-ci/test/gitlab-ci.yml
View file

@ -421,6 +421,15 @@ yaml-toml-shell-py-test:
- debian-testing
- !reference [.required-for-hardware-jobs, needs]
.b2c-x86_64-test-vk-manual:
extends:
- .use-debian/x86_64_test-vk
- .b2c-x86_64-test
needs:
- debian/x86_64_test-vk
- debian-build-testing
- !reference [.required-for-hardware-jobs, needs]
.b2c-x86_64-test-gl:
extends:
- .use-debian/x86_64_test-gl
@ -430,6 +439,15 @@ yaml-toml-shell-py-test:
- debian-testing
- !reference [.required-for-hardware-jobs, needs]
.b2c-x86_64-test-gl-manual:
extends:
- .use-debian/x86_64_test-gl
- .b2c-x86_64-test
needs:
- debian/x86_64_test-gl
- debian-build-testing
- !reference [.required-for-hardware-jobs, needs]
.b2c-arm64-test:
extends:
- .b2c-test

2
src/gallium/drivers/r300/ci/gitlab-ci.yml
View file

@ -3,7 +3,7 @@ include:
.ondracka-generic:
extends:
- .b2c-x86_64-test-gl
- .b2c-x86_64-test-gl-manual # use debian-build-testing rather than debian-testing
- .r300-manual-rules
variables:
FDO_CI_CONCURRENT: 2

4
src/nouveau/ci/gitlab-ci.yml
View file

@ -3,7 +3,7 @@ include:
nvk-ga106-vkcts-valve:
extends:
- .b2c-x86_64-test-vk
- .b2c-x86_64-test-vk-manual
- .nvk-vkcts
- .nvk-ga106-valve
- .nvk-valve-manual-rules
@ -14,7 +14,7 @@ nvk-ga106-vkcts-valve:
nvk-ga106-vkd3d-valve:
extends:
- .b2c-x86_64-test-vk
- .b2c-x86_64-test-vk-manual
- .nvk-vkcts
- .nvk-ga106-valve
- .nvk-valve-manual-rules