fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 11:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ci: Re-enable Collabora CI

Browse source 
Now that all our S3 issues have been resolved, let's start running some
tests again.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34244>
This commit is contained in:
Daniel Stone 2025-03-27 16:52:13 +00:00 • committed by Marge Bot
parent 334a4da5c0
commit df97f243e6
4 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
.ci-farms-disabled/collabora → .ci-farms/collabora
View file

4
src/amd/ci/gitlab-ci.yml
View file

@ -51,6 +51,8 @@ radeonsi-stoney-traces:
extends: extends:
- .lava-piglit-traces:x86_64 - .lava-piglit-traces:x86_64
- .radeonsi-stoney-test:x86_64 - .radeonsi-stoney-test:x86_64
rules:
- when: never # temporarily disabled due to S3 issues
variables: variables:
EGL_PLATFORM: surfaceless EGL_PLATFORM: surfaceless
PIGLIT_TRACES_FILE: traces-amd.yml PIGLIT_TRACES_FILE: traces-amd.yml
@ -95,6 +97,8 @@ radv-raven-traces-restricted:
- .radv-raven-test:x86_64 - .radv-raven-test:x86_64
- .lava-lenovo-TPad-C13-Yoga-zork:x86_64 - .lava-lenovo-TPad-C13-Yoga-zork:x86_64
- .radv-collabora-restricted-rules - .radv-collabora-restricted-rules
rules:
- when: never # temporarily disabled due to S3 issues
variables: variables:
HWCI_START_WESTON: 1 HWCI_START_WESTON: 1
PIGLIT_REPLAY_ANGLE_TAG: "2023-02-10-1" PIGLIT_REPLAY_ANGLE_TAG: "2023-02-10-1"

4
src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
View file

@ -200,6 +200,8 @@
# HWCI_TEST_SCRIPT, but .lava-piglit-traces having to come first to get # HWCI_TEST_SCRIPT, but .lava-piglit-traces having to come first to get
# dependencies right. # dependencies right.
- .lava-traces-base - .lava-traces-base
rules:
- when: never # temporarily disabled due to S3 issues
variables: variables:
VK_DRIVER: intel VK_DRIVER: intel
GPU_VERSION: zink-anv-adl GPU_VERSION: zink-anv-adl
@ -225,6 +227,8 @@
# HWCI_TEST_SCRIPT, but .lava-piglit-traces having to come first to get # HWCI_TEST_SCRIPT, but .lava-piglit-traces having to come first to get
# dependencies right. # dependencies right.
- .lava-traces-base - .lava-traces-base
rules:
- when: never # temporarily disabled due to S3 issues
variables: variables:
VK_DRIVER: intel VK_DRIVER: intel
GPU_VERSION: zink-anv-tgl GPU_VERSION: zink-anv-tgl

2
src/intel/ci/gitlab-ci-inc.yml
View file

@ -419,6 +419,8 @@
.iris-traces: .iris-traces:
extends: extends:
- .lava-traces-base - .lava-traces-base
rules:
- when: never # temporarily disabled due to S3 issues
variables: variables:
EGL_PLATFORM: surfaceless EGL_PLATFORM: surfaceless
PIGLIT_REPLAY_DEVICE_NAME: "gl-${GPU_VERSION}" PIGLIT_REPLAY_DEVICE_NAME: "gl-${GPU_VERSION}"