From f168dc6d537c21cae52d2b9a6f1f4bcf22e74bf1 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 24 Apr 2024 22:35:52 +0200 Subject: [PATCH] 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 Part-of: --- src/gallium/drivers/zink/ci/gitlab-ci-inc.yml | 4 ++-- src/gallium/drivers/zink/ci/gitlab-ci.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml index 07592094ca5..91e9770a264 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml @@ -77,7 +77,7 @@ - !reference [.nvk-valve-manual-rules, rules] - !reference [.zink-common-manual-rules, rules] -.zink-turnip-rules: +.zink-turnip-collabora-rules: stage: layered-backends rules: - !reference [.test, rules] @@ -86,7 +86,7 @@ variables: ZINK_DEBUG: optimal_keys -.zink-turnip-manual-rules: +.zink-turnip-collabora-manual-rules: stage: layered-backends retry: !reference [.scheduled_pipeline-rules, retry] rules: diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml index 7113a534bc5..771890b1346 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml @@ -95,7 +95,7 @@ zink-nvk-ga106-glcts-piglit-valve: zink-tu-a618: extends: - .lava-test-deqp:arm64 - - .zink-turnip-rules + - .zink-turnip-collabora-rules - .zink-test - .lava-sc7180-trogdor-lazor-limozeen:arm64 variables: @@ -115,7 +115,7 @@ zink-tu-a618-full: zink-tu-a618-traces: extends: - a618-traces - - .zink-turnip-rules + - .zink-turnip-collabora-rules - .zink-trace-test parallel: null variables: @@ -124,11 +124,11 @@ zink-tu-a618-traces: zink-tu-a618-traces-performance: extends: - zink-tu-a618-traces - - .zink-turnip-manual-rules + - .zink-turnip-collabora-manual-rules - .piglit-performance:arm64 rules: - !reference [.piglit-performance:arm64, rules] - - !reference [.zink-turnip-manual-rules, rules] + - !reference [.zink-turnip-collabora-manual-rules, rules] variables: # Always use the same device # a618 tag starts with cbg-1 (not cbg-0) for some reason