From: Neil Armstrong <narmstrong@baylibre.com>
Date: Wed, 25 Mar 2020 16:06:18 +0000 (+0100)
Subject: gitlab-ci: re-enable mali400/450 and t820 jobs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=51831537a2af75adc7d1611e4a7d6b02706eb32b;p=mesa.git

gitlab-ci: re-enable mali400/450 and t820 jobs

The FILES_HOST_NAME and FILES_HOST_URL are in the baylibre's runner
environment to make it more flexible.

Also use the new aarch64 mesa-ci-aarch64-lava-baylibre runner with
embedded nginx server to serve the LAVA artifacts.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4295>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4295>
---

diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index e175a067f19..2eea316deeb 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -135,7 +135,7 @@ panfrost-t860-gles3:arm64:
   tags:
     - mesa-ci-aarch64-lava-collabora
 
-.panfrost-t820-gles2:arm64:
+panfrost-t820-gles2:arm64:
   extends:
     - .lava-test:arm64
     - .panfrost-rules
@@ -145,9 +145,9 @@ panfrost-t860-gles3:arm64:
     LAVA_TAGS: panfrost
     ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6"
   tags:
-    - lava-meson-gxm-khadas-vim2
+    - mesa-ci-aarch64-lava-baylibre
 
-.lima-mali400-test:armhf:
+lima-mali400-test:armhf:
   parallel: 2
   extends:
     - .lava-test:armhf
@@ -157,9 +157,9 @@ panfrost-t860-gles3:arm64:
     GPU_VERSION: lima
     ENV_VARS: "DEQP_PARALLEL=3"
   tags:
-    - lava-sun8i-h3-libretech-all-h3-cc
+    - mesa-ci-aarch64-lava-baylibre
 
-.lima-mali450-test:arm64:
+lima-mali450-test:arm64:
   extends:
     - .lava-test:arm64
     - .lima-rules
@@ -168,4 +168,4 @@ panfrost-t860-gles3:arm64:
     GPU_VERSION: lima
     ENV_VARS: "DEQP_PARALLEL=6"
   tags:
-    - lava-meson-gxl-s905x-libretech-cc
+    - mesa-ci-aarch64-lava-baylibre