From 728ae85b5de06f6f4d1249f923cb3dd190749aed Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 11 Jul 2023 17:39:44 +0100 Subject: [PATCH] ci: move panfrost files rules to src/panfrost/ci/gitlab-ci.yml Signed-off-by: Eric Engestrom Acked-by: David Heidelberg Acked-by: Mike Blumenkrantz Part-of: --- .gitlab-ci/test-source-dep.yml | 73 --------------------------------- src/panfrost/ci/gitlab-ci.yml | 74 ++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 73 deletions(-) diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index 43c35719b9f..0652bd00f16 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -277,79 +277,6 @@ - src/gallium/frontends/rusticl/**/* when: on_success -.panfrost-midgard-rules: - stage: arm - rules: - - !reference [.collabora-farm-rules, rules] - - !reference [.gl-rules, rules] - - changes: &panfrost_gallium_file_list - - src/gallium/drivers/panfrost/**/* - - src/gallium/winsys/panfrost/**/* - when: on_success - - changes: &panfrost_common_file_list - - src/panfrost/ci/* - - src/panfrost/include/* - - src/panfrost/lib/* - - src/panfrost/shared/* - - src/panfrost/util/* - when: on_success - - changes: - - src/panfrost/midgard/**/* - when: on_success - -.panfrost-midgard-manual-rules: - stage: arm - retry: !reference [.scheduled_pipeline-rules, retry] - rules: - - !reference [.collabora-farm-manual-rules, rules] - - !reference [.gl-manual-rules, rules] - - changes: *panfrost_gallium_file_list - when: manual - - changes: *panfrost_common_file_list - when: manual - - changes: - - src/panfrost/midgard/**/* - when: manual - -.panfrost-bifrost-rules: - stage: arm - rules: - - !reference [.collabora-farm-rules, rules] - - !reference [.vulkan-rules, rules] - - !reference [.gl-rules, rules] - - changes: - *panfrost_common_file_list - when: on_success - - changes: - *panfrost_gallium_file_list - when: on_success - - changes: &panfrost_vulkan_file_list - - src/panfrost/vulkan/* - when: on_success - - changes: &panfrost_bifrost_file_list - - src/panfrost/compiler/**/* - when: on_success - -.panfrost-bifrost-manual-rules: - stage: arm - retry: !reference [.scheduled_pipeline-rules, retry] - rules: - - !reference [.collabora-farm-manual-rules, rules] - - !reference [.vulkan-manual-rules, rules] - - !reference [.gl-manual-rules, rules] - - changes: - *panfrost_common_file_list - when: manual - - changes: - *panfrost_gallium_file_list - when: manual - - changes: - *panfrost_vulkan_file_list - when: manual - - changes: - *panfrost_bifrost_file_list - when: manual - .broadcom-common-rules: rules: - changes: &broadcom_file_list diff --git a/src/panfrost/ci/gitlab-ci.yml b/src/panfrost/ci/gitlab-ci.yml index 527c8b5d65e..d60061492d8 100644 --- a/src/panfrost/ci/gitlab-ci.yml +++ b/src/panfrost/ci/gitlab-ci.yml @@ -1,3 +1,77 @@ +.panfrost-midgard-rules: + stage: arm + rules: + - !reference [.collabora-farm-rules, rules] + - !reference [.gl-rules, rules] + - changes: &panfrost_gallium_file_list + - src/gallium/drivers/panfrost/**/* + - src/gallium/winsys/panfrost/**/* + when: on_success + - changes: &panfrost_common_file_list + - src/panfrost/ci/* + - src/panfrost/include/* + - src/panfrost/lib/* + - src/panfrost/shared/* + - src/panfrost/util/* + when: on_success + - changes: + - src/panfrost/midgard/**/* + when: on_success + +.panfrost-midgard-manual-rules: + stage: arm + retry: !reference [.scheduled_pipeline-rules, retry] + rules: + - !reference [.collabora-farm-manual-rules, rules] + - !reference [.gl-manual-rules, rules] + - changes: *panfrost_gallium_file_list + when: manual + - changes: *panfrost_common_file_list + when: manual + - changes: + - src/panfrost/midgard/**/* + when: manual + +.panfrost-bifrost-rules: + stage: arm + rules: + - !reference [.collabora-farm-rules, rules] + - !reference [.vulkan-rules, rules] + - !reference [.gl-rules, rules] + - changes: + *panfrost_common_file_list + when: on_success + - changes: + *panfrost_gallium_file_list + when: on_success + - changes: &panfrost_vulkan_file_list + - src/panfrost/vulkan/* + when: on_success + - changes: &panfrost_bifrost_file_list + - src/panfrost/compiler/**/* + when: on_success + +.panfrost-bifrost-manual-rules: + stage: arm + retry: !reference [.scheduled_pipeline-rules, retry] + rules: + - !reference [.collabora-farm-manual-rules, rules] + - !reference [.vulkan-manual-rules, rules] + - !reference [.gl-manual-rules, rules] + - changes: + *panfrost_common_file_list + when: manual + - changes: + *panfrost_gallium_file_list + when: manual + - changes: + *panfrost_vulkan_file_list + when: manual + - changes: + *panfrost_bifrost_file_list + when: manual + + .panfrost-test: variables: FLAKES_CHANNEL: "#panfrost-ci"