From 5c8fc0b1f4ba04735a6cafe8352376ccf81bbbd4 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Mon, 16 Nov 2020 09:07:37 +0100
Subject: [PATCH] Revert "ci: Temporarily disable jobs on the Collabora lab"

Lab is back online now.

This reverts commit 902ac3d7c5ab75f2ff31bf23d1d5add7b5c377ed.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7630>
---
 .gitlab-ci/lava-gitlab-ci.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 4dd08d7d2cd..edb2542fb0c 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -161,7 +161,7 @@ kernel+rootfs_armhf:
     - .lava-test:arm64
     - .lava-traces-base
 
-.panfrost-t720-gles2:arm64:
+panfrost-t720-gles2:arm64:
   extends:
     - .lava-test:arm64
     - .panfrost-rules
@@ -215,14 +215,14 @@ kernel+rootfs_armhf:
   tags:
     - mesa-ci-aarch64-lava-collabora
 
-.panfrost-t860-gles2:arm64:
+panfrost-t860-gles2:arm64:
   extends:
     - .lava-test:arm64
     - .lava-rk3399-gru-kevin
   variables:
     ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T860"
 
-.panfrost-t860-gles3:arm64:
+panfrost-t860-gles3:arm64:
   parallel: 2
   extends:
     - .lava-test:arm64
@@ -231,14 +231,14 @@ kernel+rootfs_armhf:
     DEQP_VERSION: gles3
     ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T860"
 
-.panfrost-t860-traces:arm64:
+panfrost-t860-traces:arm64:
   extends:
     - .lava-traces:arm64
     - .lava-rk3399-gru-kevin
   variables:
     ENV_VARS: "PAN_MESA_DEBUG=deqp MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330"
 
-.panfrost-g52-gles2:arm64:
+panfrost-g52-gles2:arm64:
   extends:
     - .lava-test:arm64
     - .panfrost-rules
@@ -288,7 +288,7 @@ kernel+rootfs_armhf:
   tags:
     - mesa-ci-aarch64-lava-baylibre
 
-.radeonsi-stoney-gles2:amd64:
+radeonsi-stoney-gles2:amd64:
   extends:
     - .lava-test:amd64
     - .radeonsi-rules
@@ -302,9 +302,9 @@ kernel+rootfs_armhf:
   tags:
     - mesa-ci-aarch64-lava-collabora
 
-.radeonsi-stoney-gles3:amd64:
+radeonsi-stoney-gles3:amd64:
   extends:
-    - .radeonsi-stoney-gles2:amd64
+    - radeonsi-stoney-gles2:amd64
   variables:
     DEQP_VERSION: gles3
     CI_NODE_INDEX: 1
@@ -312,9 +312,9 @@ kernel+rootfs_armhf:
   tags:
     - mesa-ci-aarch64-lava-collabora
 
-.radeonsi-stoney-gles31:amd64:
+radeonsi-stoney-gles31:amd64:
   extends:
-    - .radeonsi-stoney-gles2:amd64
+    - radeonsi-stoney-gles2:amd64
   variables:
     DEQP_VERSION: gles31
     CI_NODE_INDEX: 1
@@ -322,7 +322,7 @@ kernel+rootfs_armhf:
   tags:
     - mesa-ci-aarch64-lava-collabora
 
-.radeonsi-stoney-traces:amd64:
+radeonsi-stoney-traces:amd64:
   extends:
     - .lava-traces:amd64
     - .radeonsi-rules