fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 20:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

intel/ci: Honor device-specific FDO_CI_CONCURRENT variables

Browse source 
FDO_CI_CONCURRENT was getting overwritten by .intel-common-test
inheriting FDO_CI_CONCURRENT: 6 from .lava-test, so change the order of
these definitions to fix that.

This change unfortunantely means that GPU_VERSION has to be overwritten
in some cases.

Additionally, drop redundant .anv-test where .anv-angle-test is used.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33671>
This commit is contained in:
Valentine Burley 2025-02-20 10:24:52 +01:00 • committed by Marge Bot
parent 38fc58107a
commit 85f9088d13
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
View file

@ -179,8 +179,8 @@
.zink-anv-adl-test:
extends:
- .lava-acer-cbv514-1h-34uz-brya:x86_64
- .anv-test
- .lava-acer-cbv514-1h-34uz-brya:x86_64
- .zink-anv-rules
- .zink-test
variables:
@ -189,8 +189,8 @@
.zink-anv-tgl-test:
extends:
- .lava-acer-cp514-2h-1160g7-volteer:x86_64
- .anv-test
- .lava-acer-cp514-2h-1160g7-volteer:x86_64
- .zink-anv-rules
- .zink-test
variables:
@ -200,8 +200,8 @@
.zink-anv-tgl-trace-test:
extends:
- .lava-piglit-traces:x86_64
- .lava-acer-cp514-2h-1130g7-volteer:x86_64
- .anv-test
- .lava-acer-cp514-2h-1130g7-volteer:x86_64
- .zink-anv-rules
- .zink-trace-test
# Add .lava-traces-base again to override .anv-test setting the

23
src/intel/ci/gitlab-ci.yml
View file

@ -3,8 +3,8 @@ include:
anv-jsl:
extends:
- .lava-acer-cb317-1h-c3z6-dedede:x86_64
- .anv-test
- .lava-acer-cb317-1h-c3z6-dedede:x86_64
variables:
DEQP_SUITE: anv-jsl
VK_DRIVER: intel
@ -23,8 +23,8 @@ anv-jsl-full:
anv-adl:
extends:
- .lava-acer-cbv514-1h-34uz-brya:x86_64
- .anv-test
- .lava-acer-cbv514-1h-34uz-brya:x86_64
variables:
DEQP_SUITE: anv-adl
VK_DRIVER: intel
@ -42,8 +42,8 @@ anv-adl-full:
anv-tgl:
extends:
- .lava-acer-cp514-2h-1160g7-volteer:x86_64
- .anv-test
- .lava-acer-cp514-2h-1160g7-volteer:x86_64
variables:
DEQP_SUITE: anv-tgl
VK_DRIVER: intel
@ -80,8 +80,8 @@ hasvk-hsw:
anv-jsl-angle:
extends:
- .lava-acer-cb317-1h-c3z6-dedede:x86_64
- .anv-angle-test
- .lava-acer-cb317-1h-c3z6-dedede:x86_64
variables:
DEQP_SUITE: anv-jsl-angle
GPU_VERSION: angle-anv-jsl
@ -96,9 +96,8 @@ anv-jsl-angle-full:
anv-adl-angle:
extends:
- .lava-acer-cbv514-1h-34uz-brya:x86_64
- .anv-test
- .anv-angle-test
- .lava-acer-cbv514-1h-34uz-brya:x86_64
variables:
DEQP_SUITE: anv-adl-angle
GPU_VERSION: angle-anv-adl
@ -114,9 +113,8 @@ anv-adl-angle-full:
anv-tgl-angle:
extends:
- .lava-acer-cp514-2h-1130g7-volteer:x86_64
- .anv-test
- .anv-angle-test
- .lava-acer-cp514-2h-1130g7-volteer:x86_64
variables:
DEQP_SUITE: anv-tgl-angle
GPU_VERSION: angle-anv-tgl
@ -187,8 +185,8 @@ iris-cml-deqp:
iris-jsl-deqp:
extends:
- .lava-acer-cb317-1h-c3z6-dedede:x86_64
- .iris-test
- .lava-acer-cb317-1h-c3z6-dedede:x86_64
variables:
DEQP_SUITE: iris-jsl
GPU_VERSION: iris-jsl
@ -282,8 +280,8 @@ iris-kbl-traces-performance:
intel-adl-cl:
extends:
- .lava-acer-cbv514-1h-34uz-brya:x86_64
- .intel-adl-test
- .lava-acer-cbv514-1h-34uz-brya:x86_64
- .intel-rules
rules:
- !reference [.intel-adl-test, rules]
@ -291,14 +289,15 @@ intel-adl-cl:
- !reference [.rusticl-rules, rules]
variables:
DEQP_SUITE: intel-adl-cl
GPU_VERSION: intel-adl
VK_DRIVER: intel
HWCI_START_WESTON: 1
timeout: 20m
intel-adl-skqp:
extends:
- .lava-acer-cbv514-1h-34uz-brya:x86_64
- .intel-adl-test
- .lava-acer-cbv514-1h-34uz-brya:x86_64
variables:
DEQP_SUITE: intel-adl-skqp
VK_DRIVER: intel
@ -307,8 +306,8 @@ intel-adl-skqp:
intel-tgl-skqp:
extends:
- .lava-acer-cp514-2h-1130g7-volteer:x86_64
- .intel-tgl-test
- .lava-acer-cp514-2h-1130g7-volteer:x86_64
variables:
DEQP_SUITE: intel-tgl-skqp
VK_DRIVER: intel