zink/ci: rename zink-turnip collabora rule to make it unambiguous
We're about to add zink-turnip jobs on another farm. Signed-off-by: Eric Engestrom <eric@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29241>
This commit is contained in:
@@ -77,7 +77,7 @@
|
|||||||
- !reference [.nvk-valve-manual-rules, rules]
|
- !reference [.nvk-valve-manual-rules, rules]
|
||||||
- !reference [.zink-common-manual-rules, rules]
|
- !reference [.zink-common-manual-rules, rules]
|
||||||
|
|
||||||
.zink-turnip-rules:
|
.zink-turnip-collabora-rules:
|
||||||
stage: layered-backends
|
stage: layered-backends
|
||||||
rules:
|
rules:
|
||||||
- !reference [.test, rules]
|
- !reference [.test, rules]
|
||||||
@@ -86,7 +86,7 @@
|
|||||||
variables:
|
variables:
|
||||||
ZINK_DEBUG: optimal_keys
|
ZINK_DEBUG: optimal_keys
|
||||||
|
|
||||||
.zink-turnip-manual-rules:
|
.zink-turnip-collabora-manual-rules:
|
||||||
stage: layered-backends
|
stage: layered-backends
|
||||||
retry: !reference [.scheduled_pipeline-rules, retry]
|
retry: !reference [.scheduled_pipeline-rules, retry]
|
||||||
rules:
|
rules:
|
||||||
|
@@ -95,7 +95,7 @@ zink-nvk-ga106-glcts-piglit-valve:
|
|||||||
zink-tu-a618:
|
zink-tu-a618:
|
||||||
extends:
|
extends:
|
||||||
- .lava-test-deqp:arm64
|
- .lava-test-deqp:arm64
|
||||||
- .zink-turnip-rules
|
- .zink-turnip-collabora-rules
|
||||||
- .zink-test
|
- .zink-test
|
||||||
- .lava-sc7180-trogdor-lazor-limozeen:arm64
|
- .lava-sc7180-trogdor-lazor-limozeen:arm64
|
||||||
variables:
|
variables:
|
||||||
@@ -115,7 +115,7 @@ zink-tu-a618-full:
|
|||||||
zink-tu-a618-traces:
|
zink-tu-a618-traces:
|
||||||
extends:
|
extends:
|
||||||
- a618-traces
|
- a618-traces
|
||||||
- .zink-turnip-rules
|
- .zink-turnip-collabora-rules
|
||||||
- .zink-trace-test
|
- .zink-trace-test
|
||||||
parallel: null
|
parallel: null
|
||||||
variables:
|
variables:
|
||||||
@@ -124,11 +124,11 @@ zink-tu-a618-traces:
|
|||||||
zink-tu-a618-traces-performance:
|
zink-tu-a618-traces-performance:
|
||||||
extends:
|
extends:
|
||||||
- zink-tu-a618-traces
|
- zink-tu-a618-traces
|
||||||
- .zink-turnip-manual-rules
|
- .zink-turnip-collabora-manual-rules
|
||||||
- .piglit-performance:arm64
|
- .piglit-performance:arm64
|
||||||
rules:
|
rules:
|
||||||
- !reference [.piglit-performance:arm64, rules]
|
- !reference [.piglit-performance:arm64, rules]
|
||||||
- !reference [.zink-turnip-manual-rules, rules]
|
- !reference [.zink-turnip-collabora-manual-rules, rules]
|
||||||
variables:
|
variables:
|
||||||
# Always use the same device
|
# Always use the same device
|
||||||
# a618 tag starts with cbg-1 (not cbg-0) for some reason
|
# a618 tag starts with cbg-1 (not cbg-0) for some reason
|
||||||
|
Reference in New Issue
Block a user