mirror of https://gitlab.freedesktop.org/mesa/mesa
freedreno/ci: Drop duplicated include and add missing stages
The .collabora-freedreno-rules are overriten by .collabora-freedreno-turnip-rules which already includes these rules. Signed-off-by: David Heidelberg <david@ixit.cz> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28323>
This commit is contained in:
parent
926865580e
commit
0e5a567523
|
@ -126,18 +126,21 @@
|
|||
|
||||
# For piglit and skqp test jobs that run both GL and VK tests.
|
||||
.google-freedreno-turnip-rules:
|
||||
stage: freedreno
|
||||
rules:
|
||||
- !reference [.test, rules]
|
||||
- !reference [.google-freedreno-rules, rules]
|
||||
- !reference [.google-turnip-rules, rules]
|
||||
|
||||
.google-freedreno-turnip-manual-rules:
|
||||
stage: freedreno
|
||||
rules:
|
||||
- !reference [.test, rules]
|
||||
- !reference [.google-freedreno-manual-rules, rules]
|
||||
- !reference [.google-turnip-manual-rules, rules]
|
||||
|
||||
.collabora-freedreno-turnip-rules:
|
||||
stage: freedreno
|
||||
rules:
|
||||
- !reference [.test, rules]
|
||||
- !reference [.collabora-freedreno-rules, rules]
|
||||
|
|
|
@ -134,7 +134,6 @@ a618_piglit:
|
|||
extends:
|
||||
- .lava-test-deqp:arm64
|
||||
- .lava-sc7180-trogdor-lazor-limozeen:arm64
|
||||
- .collabora-freedreno-rules
|
||||
# Note that piglit has GL+VK integration testing.
|
||||
- .collabora-freedreno-turnip-rules
|
||||
variables:
|
||||
|
|
Loading…
Reference in New Issue