ci: Flip db410c back to docker mode.

Turns out there's corporate policy to not deploy AGPL software, so I
have to take down the LAVA lab until we sort out how to do it without
a local server.

Reviewed-by: Daniel Stone <daniels@collabora.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4038>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4038>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 13b544b..94fa883 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -686,6 +686,14 @@ arm64_a630_gles3:
   variables:
     DEQP_VER: gles3
 
+arm64_a306_gles2:
+  extends: arm64_a630_gles2
+  variables:
+    DEQP_EXPECTED_FAILS: deqp-freedreno-a307-fails.txt
+    DEQP_SKIPS: deqp-default-skips.txt
+  tags:
+    - db410c
+
 # RADV CI
 .test-radv:
   variables:

diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 6380b4a..64d84ad 100644 (file)
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -140,7 +140,7 @@ lima-mali450-test:arm64:
   tags:
     - lava-meson-gxl-s905x-libretech-cc
 
-freedreno-a307-gles2:
+.freedreno-a307-gles2:
   extends: .lava-test:arm64
   variables:
     DEVICE_TYPE: apq8016-sbc
@@ -153,6 +153,6 @@ freedreno-a307-gles2:
 
 .freedreno-a307-gles3:
   parallel: 6
-  extends: freedreno-a307-gles2
+  extends: .freedreno-a307-gles2
   variables:
     DEQP_VERSION: gles3