fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 15:48:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

zink/ci: allow running manual jobs again on RADV

Browse source 
Fixes: f6c06ef2f6 ("ci: Add manual rules variations to disable.")
Reviewed-by: Emma Anholt <emma@anholt.net>
Signed-off-by: Martin Roukala (né Peres) <martin.roukala@mupuf.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21036>
This commit is contained in:
Martin Roukala (né Peres) 2023-02-01 13:49:57 +02:00
parent 0c54f261ea
commit 9e2365708b
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci/test-source-dep.yml
View file

@ -748,11 +748,11 @@
- !reference [.turnip-rules, rules]
- !reference [.zink-common-rules, rules]
.zink-radv-rules:
.zink-radv-manual-rules:
stage: layered-backends
rules:
- !reference [.radv-rules, rules]
- !reference [.zink-common-rules, rules]
- !reference [.radv-valve-manual-rules, rules]
- !reference [.zink-common-manual-rules, rules]
# Unfortunately YAML doesn't let us concatenate arrays, so we have to do the
# rules duplication manually

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

@ -127,7 +127,6 @@ zink-freedreno-a630-traces:
############### Combined testing (GL, GLES, Piglit) on RADV
.radv-zink-test-valve:
extends:
- .zink-radv-rules
- .zink-test
- .test-radv
- .b2c-test-gl
@ -144,7 +143,7 @@ zink-radv-navi10-valve:
extends:
- .radv-zink-test-valve
- .navi10-test-valve
- .radv-valve-manual-rules
- .zink-radv-manual-rules
variables:
GPU_VERSION: zink-radv-navi10
@ -153,6 +152,6 @@ zink-radv-vangogh-valve:
extends:
- .radv-zink-test-valve
- .vangogh-test-valve
- .radv-valve-manual-rules
- .zink-radv-manual-rules
variables:
GPU_VERSION: zink-radv-vangogh