Module: Mesa Branch: main Commit: 1b7a4029d0a21665f4218336301c2919e2af407c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b7a4029d0a21665f4218336301c2919e2af407c
Author: Erik Faye-Lund <[email protected]> Date: Mon Apr 3 13:31:56 2023 +0200 virgl/ci: clean up manual rules for virgl In f6c06ef2f66 ("ci: Add manual rules variations to disable irrelevant driver jobs."), we fixed this for *most* driver. This fixes up the last driver, hopefully removing an annoying needless button in the UI for some MRs. Reviewed-by: Emma Anholt <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Acked-by: Guilherme Gallo <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22263> --- .gitlab-ci/test-source-dep.yml | 12 ++++++++++++ src/gallium/drivers/virgl/ci/gitlab-ci.yml | 3 +-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index d418ebaf4ba..ace142d30ab 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -755,6 +755,18 @@ - src/gallium/winsys/virgl/**/* when: on_success +.virgl-iris-manual-rules: + stage: layered-backends + rules: + - !reference [.collabora-farm-rules, rules] + - !reference [.gl-manual-rules, rules] + - changes: + *virgl_file_list + when: manual + - changes: + *iris_file_list + when: manual + .virgl-iris-rules-performance: stage: layered-backends rules: diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci.yml b/src/gallium/drivers/virgl/ci/gitlab-ci.yml index ccbc19d22a6..fb46d1e1ba3 100644 --- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml +++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml @@ -90,8 +90,7 @@ virgl-traces: virgl-iris-traces: extends: - .virgl-iris-test - - .virgl-rules - - .test-manual-mr + - .virgl-iris-manual-rules variables: PIGLIT_REPLAY_EXTRA_ARGS: "--keep-image --download-caching-proxy-url=${FDO_HTTP_CACHE_URI}"
