diff options
| author | David Heidelberg <david.heidelberg@collabora.com> | 2023-03-12 19:17:35 +0100 |
|---|---|---|
| committer | David Heidelberg <david.heidelberg@collabora.com> | 2023-03-12 20:50:14 +0100 |
| commit | 7cf7d497e7a378c8d06beab84353499a605ece54 (patch) | |
| tree | ca4d42496bc311759821cadb94d9e652bf9e9567 | |
| parent | 3d4f6a00b8e8710bbc265f8a5e3050d0550e1491 (diff) | |
ci/clover: disable the jobs
Prepare for Clover removal; don't waste resources on Clover anymore.
Acked-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21865>
| -rw-r--r-- | .gitlab-ci/build/gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | .gitlab-ci/test-source-dep.yml | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 3c09570af46..14842c6e451 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -143,7 +143,8 @@ debian-testing-msan: - .gitlab-ci/meson/build.sh - .gitlab-ci/prepare-artifacts.sh -debian-clover-testing: +# TODO: remove together with Clover +.debian-clover-testing: extends: - .debian-cl-testing variables: @@ -563,7 +564,8 @@ windows-vs2019: EXTRA_OPTION: > -D valgrind=disabled -debian-clover: +# TODO: remove with Clover +.debian-clover: extends: .debian-cl variables: GALLIUM_DRIVERS: "r600,radeonsi,swrast" diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index 328f0c77e31..033b4995e77 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -199,6 +199,7 @@ *llvmpipe_file_list when: on_success +# TODO: remove together with Clover .llvmpipe-clover-rules: rules: - !reference [.llvmpipe-cl-rules, rules] diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml index dba4d73ccec..545058e0c2b 100644 --- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml +++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml @@ -16,12 +16,13 @@ LP_NUM_THREADS: 1 PIGLIT_PROFILES: cl -llvmpipe-piglit-clover: +# TODO: remove together with Clover +.llvmpipe-piglit-clover: extends: - .llvmpipe-piglit-cl - .llvmpipe-clover-rules needs: - - debian-clover-testing + - .debian-clover-testing - debian/x86_test-gl variables: LP_CL: 1 |