Module: Mesa Branch: main Commit: d01a149b8b46fe33ae16ff0f43d31c2325a3e5b2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d01a149b8b46fe33ae16ff0f43d31c2325a3e5b2
Author: Boris Brezillon <boris.brezil...@collabora.com> Date: Tue Apr 19 08:18:13 2022 -0700 ci/windows: Split the windows-related tests Should help with the timeouts we see in CI right now. Reviewed-by: Jesse Natalie <jenat...@microsoft.com> Acked-by: Emma Anholt <e...@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16042> --- .gitlab-ci/test-source-dep.yml | 40 +++++++++++++++++++++++++++--- src/gallium/drivers/d3d12/ci/gitlab-ci.yml | 2 +- src/microsoft/ci/gitlab-ci.yml | 4 +-- 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index c0d12bab70a..653077fdc36 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -607,12 +607,14 @@ when: on_success - changes: &d3d12_file_list - src/gallium/drivers/d3d12/**/* - - src/microsoft/**/* - src/gallium/frontends/wgl/* - src/gallium/winsys/d3d12/wgl/* - src/gallium/targets/libgl-gdi/* - src/gallium/targets/libgl-d3d12/* when: on_success + - changes: + - src/microsoft/**/* + when: on_success - changes: *zink_file_list when: on_success @@ -621,7 +623,7 @@ when: on_success - when: never -.windows-test-rules: +.glon12-test-rules: rules: - if: '$MICROSOFT_FARM == "offline"' when: never @@ -631,14 +633,44 @@ when: on_success - changes: *gallium_core_file_list + - changes: *d3d12_file_list when: on_success - changes: - *lavapipe_file_list + - src/microsoft/compiler/* + when: on_success + - when: never + +.spirv2dxil-test-rules: + rules: + - if: '$MICROSOFT_FARM == "offline"' + when: never + - *ignore_scheduled_pipelines + - changes: + *mesa_core_file_list + when: on_success + - changes: &spirv2dxil_file_list + - src/microsoft/ci/* + - src/microsoft/compiler/* + - src/microsoft/spirv_to_dxil/* + when: on_success + - when: never + +.dozen-test-rules: + rules: + - if: '$MICROSOFT_FARM == "offline"' + when: never + - *ignore_scheduled_pipelines + - changes: + *mesa_core_file_list when: on_success - changes: *vulkan_file_list when: on_success - - changes: *d3d12_file_list + - changes: + *spirv2dxil_file_list + when: on_success + - changes: + - src/microsoft/vulkan/* when: on_success - when: never diff --git a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml index 52b5bfdf0f9..353fec726d0 100644 --- a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml +++ b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml @@ -2,7 +2,7 @@ extends: - .build-windows - .use-windows_test_vs2019 - - .windows-test-rules + - .glon12-test-rules stage: layered-backends dependencies: - windows-vs2019 diff --git a/src/microsoft/ci/gitlab-ci.yml b/src/microsoft/ci/gitlab-ci.yml index e30f52b2565..c3ddbbed7d3 100644 --- a/src/microsoft/ci/gitlab-ci.yml +++ b/src/microsoft/ci/gitlab-ci.yml @@ -2,7 +2,7 @@ test-spirv2dxil-windows: extends: - .build-windows - .use-windows_test_vs2019 - - .windows-test-rules + - .spirv2dxil-test-rules stage: layered-backends dependencies: - windows-vs2019 @@ -23,7 +23,7 @@ test-dozen-deqp: extends: - .build-windows - .use-windows_test_vs2019 - - .windows-test-rules + - .dozen-test-rules stage: layered-backends dependencies: - windows-vs2019
