Mesa (main): Revert "CI: Disable Collabora lab"

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: cdb7a3b0e26233b3d0670806f91aed2428947e1e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cdb7a3b0e26233b3d0670806f91aed2428947e1e

Author: Daniel Stone <daniels at collabora.com>
Date:   Fri Jul 15 16:27:44 2022 +0100

Revert "CI: Disable Collabora lab"

This reverts commit 7a336c97ef692ed96cc93394596a7d0650983874.

Signed-off-by: Daniel Stone <daniels at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17563>

---

 .gitlab-ci.yml                            | 2 +-
 src/freedreno/ci/gitlab-ci.yml            | 6 +++---
 src/gallium/drivers/zink/ci/gitlab-ci.yml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35ac897cd3f..0ccb91954b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ variables:
   # Individual CI farm status, set to "offline" to disable jobs
   # running on a particular CI farm (ie. for outages, etc):
   FD_FARM: "online"
-  COLLABORA_FARM: "offline"
+  COLLABORA_FARM: "online"
   MICROSOFT_FARM: "online"
   LIMA_FARM: "online"
   IGALIA_FARM: "online"
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index ed8ad9a27f4..51ce2f88191 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -124,7 +124,7 @@ a530-traces:
     PIGLIT_REPLAY_DEVICE_NAME: "freedreno-a530"
     PIGLIT_RESULTS: "freedreno-a530-replay"
 
-.a618_vk:
+a618_vk:
   extends:
     - .lava-test:arm64
     - .turnip-rules
@@ -143,9 +143,9 @@ a530-traces:
     # the .5s default.
     FREEDRENO_HANGCHECK_MS: 2000
 
-.a618_vk_full:
+a618_vk_full:
   extends:
-    - .a618_vk
+    - a618_vk
     - .test-manual-mr
   # We use a longer timeout to keep the parallel down so that we don't lock up
   # too many runners for a long time when a dev is trying out at full VK status.
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index 328cd506059..1d6b800a5f4 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -23,7 +23,7 @@ zink:
   script:
     - xvfb-run --server-args='-noreset' sh -c "GALLIUM_DRIVER=zink VK_DRIVER=lvp install/deqp-runner.sh"
 
-.zink-anv-tgl:
+zink-anv-tgl:
   extends:
     - .anv-tgl-test
     - .zink-anv-rules