From df97f243e68f3d545608691b29e4451f5d096968 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 27 Mar 2025 16:52:13 +0000 Subject: [PATCH] ci: Re-enable Collabora CI Now that all our S3 issues have been resolved, let's start running some tests again. Signed-off-by: Daniel Stone Part-of: --- {.ci-farms-disabled => .ci-farms}/collabora | 0 src/amd/ci/gitlab-ci.yml | 4 ++++ src/gallium/drivers/zink/ci/gitlab-ci-inc.yml | 4 ++++ src/intel/ci/gitlab-ci-inc.yml | 2 ++ 4 files changed, 10 insertions(+) rename {.ci-farms-disabled => .ci-farms}/collabora (100%) diff --git a/.ci-farms-disabled/collabora b/.ci-farms/collabora similarity index 100% rename from .ci-farms-disabled/collabora rename to .ci-farms/collabora diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml index f60af00fe57..2c6a441ddba 100644 --- a/src/amd/ci/gitlab-ci.yml +++ b/src/amd/ci/gitlab-ci.yml @@ -51,6 +51,8 @@ radeonsi-stoney-traces: extends: - .lava-piglit-traces:x86_64 - .radeonsi-stoney-test:x86_64 + rules: + - when: never # temporarily disabled due to S3 issues variables: EGL_PLATFORM: surfaceless PIGLIT_TRACES_FILE: traces-amd.yml @@ -95,6 +97,8 @@ radv-raven-traces-restricted: - .radv-raven-test:x86_64 - .lava-lenovo-TPad-C13-Yoga-zork:x86_64 - .radv-collabora-restricted-rules + rules: + - when: never # temporarily disabled due to S3 issues variables: HWCI_START_WESTON: 1 PIGLIT_REPLAY_ANGLE_TAG: "2023-02-10-1" diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml index 9361d0437e7..a75fe6ded3c 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml @@ -200,6 +200,8 @@ # HWCI_TEST_SCRIPT, but .lava-piglit-traces having to come first to get # dependencies right. - .lava-traces-base + rules: + - when: never # temporarily disabled due to S3 issues variables: VK_DRIVER: intel GPU_VERSION: zink-anv-adl @@ -225,6 +227,8 @@ # HWCI_TEST_SCRIPT, but .lava-piglit-traces having to come first to get # dependencies right. - .lava-traces-base + rules: + - when: never # temporarily disabled due to S3 issues variables: VK_DRIVER: intel GPU_VERSION: zink-anv-tgl diff --git a/src/intel/ci/gitlab-ci-inc.yml b/src/intel/ci/gitlab-ci-inc.yml index 7c20aec5ecb..7db848e22ab 100644 --- a/src/intel/ci/gitlab-ci-inc.yml +++ b/src/intel/ci/gitlab-ci-inc.yml @@ -419,6 +419,8 @@ .iris-traces: extends: - .lava-traces-base + rules: + - when: never # temporarily disabled due to S3 issues variables: EGL_PLATFORM: surfaceless PIGLIT_REPLAY_DEVICE_NAME: "gl-${GPU_VERSION}"