From 52528c7088f76914d8308575a8abe0233ca86f71 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 11 Jul 2023 17:36:20 +0100 Subject: [PATCH] ci: move freedreno files rules to src/freedreno/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 | 92 --------------------------------- src/freedreno/ci/gitlab-ci.yml | 93 ++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 92 deletions(-) diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index 94dd108d0a5..a40c412b1ff 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -277,98 +277,6 @@ - src/gallium/frontends/rusticl/**/* when: on_success -# Rules for changes that impact either freedreno or turnip. -.freedreno-common-rules: - rules: - - !reference [.no_scheduled_pipelines-rules, rules] - - !reference [.freedreno-farm-rules, rules] - - changes: &freedreno_core_file_list - - src/freedreno/ci/**/* - - src/freedreno/common/**/* - - src/freedreno/drm/**/* - - src/freedreno/fdl/**/* - - src/freedreno/ir3/**/* - - src/freedreno/isa/**/* - - src/freedreno/registers/**/* - when: on_success - -.freedreno-common-manual-rules: - retry: !reference [.scheduled_pipeline-rules, retry] - rules: - - !reference [.freedreno-farm-manual-rules, rules] - - !reference [.core-manual-rules, rules] - - changes: - *freedreno_core_file_list - when: manual - -.freedreno-rules: - stage: freedreno - rules: - - !reference [.freedreno-common-rules, rules] - - !reference [.gl-rules, rules] - - changes: &freedreno_gl_file_list - - src/freedreno/ir2/**/* - - src/gallium/drivers/freedreno/**/* - - src/gallium/winsys/freedreno/**/* - when: on_success - -.freedreno-manual-rules: - stage: freedreno - retry: !reference [.scheduled_pipeline-rules, retry] - rules: - - !reference [.freedreno-common-manual-rules, rules] - - !reference [.gl-manual-rules, rules] - - changes: - *freedreno_gl_file_list - when: manual - -.turnip-rules: - stage: freedreno - rules: - - !reference [.freedreno-common-rules, rules] - - !reference [.vulkan-rules, rules] - - changes: &freedreno_vulkan_file_list - - src/freedreno/vulkan/**/* - when: on_success - -.turnip-manual-rules: - stage: freedreno - retry: !reference [.scheduled_pipeline-rules, retry] - rules: - - !reference [.freedreno-common-manual-rules, rules] - - !reference [.vulkan-manual-rules, rules] - - changes: - *freedreno_vulkan_file_list - when: manual - -# For piglit and skqp test jobs that run both GL and VK tests. -.freedreno-turnip-rules: - rules: - - !reference [.freedreno-rules, rules] - - !reference [.turnip-rules, rules] - -.freedreno-rules-restricted: - stage: freedreno - rules: - - !reference [.restricted-rules, rules] - - !reference [.freedreno-rules, rules] - -.freedreno-rules-performance: - stage: freedreno - retry: !reference [.scheduled_pipeline-rules, retry] - rules: - - !reference [.performance-rules, rules] - - !reference [.freedreno-manual-rules, rules] - allow_failure: true # see comment in .performance-rules, which we don't inherit this line from. - variables: - LAVA_JOB_PRIORITY: 40 - # Ensure that we are using the release build artifact - S3_ARTIFACT_NAME: mesa-arm64-default-release - needs: - - debian/arm64_test - - debian-arm64-release - dependencies: null - .nouveau-rules: stage: nouveau rules: diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml index eb8db153d67..5f4606fd7ac 100644 --- a/src/freedreno/ci/gitlab-ci.yml +++ b/src/freedreno/ci/gitlab-ci.yml @@ -1,3 +1,96 @@ +# Rules for changes that impact either freedreno or turnip. +.freedreno-common-rules: + rules: + - !reference [.no_scheduled_pipelines-rules, rules] + - !reference [.freedreno-farm-rules, rules] + - changes: &freedreno_core_file_list + - src/freedreno/ci/**/* + - src/freedreno/common/**/* + - src/freedreno/drm/**/* + - src/freedreno/fdl/**/* + - src/freedreno/ir3/**/* + - src/freedreno/isa/**/* + - src/freedreno/registers/**/* + when: on_success + +.freedreno-common-manual-rules: + retry: !reference [.scheduled_pipeline-rules, retry] + rules: + - !reference [.freedreno-farm-manual-rules, rules] + - !reference [.core-manual-rules, rules] + - changes: + *freedreno_core_file_list + when: manual + +.freedreno-rules: + stage: freedreno + rules: + - !reference [.freedreno-common-rules, rules] + - !reference [.gl-rules, rules] + - changes: &freedreno_gl_file_list + - src/freedreno/ir2/**/* + - src/gallium/drivers/freedreno/**/* + - src/gallium/winsys/freedreno/**/* + when: on_success + +.freedreno-manual-rules: + stage: freedreno + retry: !reference [.scheduled_pipeline-rules, retry] + rules: + - !reference [.freedreno-common-manual-rules, rules] + - !reference [.gl-manual-rules, rules] + - changes: + *freedreno_gl_file_list + when: manual + +.turnip-rules: + stage: freedreno + rules: + - !reference [.freedreno-common-rules, rules] + - !reference [.vulkan-rules, rules] + - changes: &freedreno_vulkan_file_list + - src/freedreno/vulkan/**/* + when: on_success + +.turnip-manual-rules: + stage: freedreno + retry: !reference [.scheduled_pipeline-rules, retry] + rules: + - !reference [.freedreno-common-manual-rules, rules] + - !reference [.vulkan-manual-rules, rules] + - changes: + *freedreno_vulkan_file_list + when: manual + +# For piglit and skqp test jobs that run both GL and VK tests. +.freedreno-turnip-rules: + rules: + - !reference [.freedreno-rules, rules] + - !reference [.turnip-rules, rules] + +.freedreno-rules-restricted: + stage: freedreno + rules: + - !reference [.restricted-rules, rules] + - !reference [.freedreno-rules, rules] + +.freedreno-rules-performance: + stage: freedreno + retry: !reference [.scheduled_pipeline-rules, retry] + rules: + - !reference [.performance-rules, rules] + - !reference [.freedreno-manual-rules, rules] + allow_failure: true # see comment in .performance-rules, which we don't inherit this line from. + variables: + LAVA_JOB_PRIORITY: 40 + # Ensure that we are using the release build artifact + S3_ARTIFACT_NAME: mesa-arm64-default-release + needs: + - debian/arm64_test + - debian-arm64-release + dependencies: null + + .google-freedreno-test: extends: - .baremetal-test-arm64