From bd2563eb02c96134a2d2fd851a7a0b202f6ce4a8 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Fri, 14 Feb 2025 11:46:56 +0100 Subject: [PATCH] turnip/ci: Rename valve-freedreno-turnip-manual-rules The valve-freedreno-turnip-manual-rules naming would suggest freedreno + turnip rules, but in fact this rule is meant to only impact turnip. Change the name to match .google-turnip-manual-rules and .collabora-turnip-manual-rules. Signed-off-by: Valentine Burley Part-of: --- src/freedreno/ci/gitlab-ci-inc.yml | 2 +- src/freedreno/ci/gitlab-ci.yml | 4 ++-- src/gallium/drivers/zink/ci/gitlab-ci-inc.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml index 7cd197bc760..77e09415d7b 100644 --- a/src/freedreno/ci/gitlab-ci-inc.yml +++ b/src/freedreno/ci/gitlab-ci-inc.yml @@ -165,7 +165,7 @@ - !reference [.valve-farm-manual-rules, rules] - !reference [.freedreno-manual-rules, rules] -.valve-freedreno-turnip-manual-rules: +.valve-turnip-manual-rules: stage: freedreno-postmerge extends: .no-auto-retry rules: diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml index 4731690d698..309a6346246 100644 --- a/src/freedreno/ci/gitlab-ci.yml +++ b/src/freedreno/ci/gitlab-ci.yml @@ -446,7 +446,7 @@ a750-vk: extends: - .b2c-freedreno-vk-test - .a750-mupuf - - .valve-freedreno-turnip-manual-rules + - .valve-turnip-manual-rules timeout: 75m # base runtime 54min total, 51min of testing variables: B2C_TIMEOUT_BOOT_MINUTES: 65 @@ -458,7 +458,7 @@ a750-vkd3d: extends: - .b2c-freedreno-vk-test - .a750-mupuf - - .valve-freedreno-turnip-manual-rules + - .valve-turnip-manual-rules timeout: 15m # base runtime 3min variables: B2C_TIMEOUT_OVERALL_MINUTES: 12 diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml index ed743fa465f..5d74cc05ef7 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml @@ -109,7 +109,7 @@ extends: .no-auto-retry rules: - !reference [.test, rules] - - !reference [.valve-freedreno-turnip-manual-rules, rules] + - !reference [.valve-turnip-manual-rules, rules] - !reference [.zink-common-manual-rules, rules] .zink-radv-rules: