Mesa (staging/20.0): gitlab-ci: add FILES_HOST_URL and move FILES_HOST_NAME into jobs

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: b637994b2cc6fb4e6860c32f46cbd6847f8d5bb4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b637994b2cc6fb4e6860c32f46cbd6847f8d5bb4

Author: Neil Armstrong <narmstrong at baylibre.com>
Date:   Wed Mar 25 17:05:46 2020 +0100

gitlab-ci: add FILES_HOST_URL and move FILES_HOST_NAME into jobs

The FILES_HOST_URL & FILES_HOST_NAME will be in the Baylibre's runner
environment, move them into the t860/t720/t760 jobs using Collabora's
runner.

Signed-off-by: Neil Armstrong <narmstrong at baylibre.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
(cherry picked from commit 842f13d8f85c16fec350418e02dc593fbbc156f4)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4462>

---

 .gitlab-ci/lava-gitlab-ci.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index f7a904030c3..1f162bd83bb 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -5,7 +5,6 @@
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
     ENV_VARS: "MESA_GLES_VERSION_OVERRIDE=3.0 DEQP_PARALLEL=6"
-    FILES_HOST_NAME: "mesa-ci-lava-files.freedesktop.org"
   script:
     - mkdir -p /srv/${FILES_HOST_NAME}/$CI_JOB_ID/
     - cp /lava-files/${KERNEL_IMAGE_NAME} /srv/${FILES_HOST_NAME}/$CI_JOB_ID/.
@@ -18,7 +17,7 @@
       artifacts/generate_lava.py \
         --template artifacts/lava-deqp.yml.jinja2 \
         --pipeline-info "$CI_PIPELINE_URL on $CI_COMMIT_REF_NAME ${CI_NODE_INDEX}/${CI_NODE_TOTAL}" \
-        --base-artifacts-url https://${FILES_HOST_NAME}/$CI_JOB_ID \
+        --base-artifacts-url ${FILES_HOST_URL}/$CI_JOB_ID \
         --device-type ${DEVICE_TYPE} \
         --env-vars "${ENV_VARS}" \
         --arch ${ARCH} \
@@ -79,6 +78,8 @@ panfrost-t720-test:arm64:
   variables:
     DEVICE_TYPE: sun50i-h6-pine-h64
     GPU_VERSION: panfrost-t720
+    FILES_HOST_NAME: "mesa-ci-lava-files.freedesktop.org"
+    FILES_HOST_URL: "https://mesa-ci-lava-files.freedesktop.org"
   tags:
     - mesa-ci-aarch64-lava-collabora
 
@@ -89,6 +90,8 @@ panfrost-t760-test:armhf:
     GPU_VERSION: panfrost-t760
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
+    FILES_HOST_NAME: "mesa-ci-lava-files.freedesktop.org"
+    FILES_HOST_URL: "https://mesa-ci-lava-files.freedesktop.org"
   tags:
     - mesa-ci-aarch64-lava-collabora
 
@@ -99,16 +102,17 @@ panfrost-t860-test:arm64:
     GPU_VERSION: panfrost-t860
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
+    FILES_HOST_NAME: "mesa-ci-lava-files.freedesktop.org"
+    FILES_HOST_URL: "https://mesa-ci-lava-files.freedesktop.org"
   tags:
     - mesa-ci-aarch64-lava-collabora
 
-panfrost-t820-test:arm64:
+.panfrost-t820-test:arm64:
   extends: .lava-test:arm64
   variables:
     DEVICE_TYPE: meson-gxm-khadas-vim2
     GPU_VERSION: panfrost-t820
     LAVA_TAGS: panfrost
-    FILES_HOST_NAME: "lava-files.baylibre.com"
   tags:
     - lava-meson-gxm-khadas-vim2
 
@@ -119,16 +123,14 @@ panfrost-t820-test:arm64:
     DEVICE_TYPE: sun8i-h3-libretech-all-h3-cc
     GPU_VERSION: lima
     ENV_VARS: "DEQP_PARALLEL=3"
-    FILES_HOST_NAME: "lava-files.baylibre.com"
   tags:
     - lava-sun8i-h3-libretech-all-h3-cc
 
-lima-mali450-test:arm64:
+.lima-mali450-test:arm64:
   extends: .lava-test:arm64
   variables:
     DEVICE_TYPE: meson-gxl-s905x-libretech-cc
     GPU_VERSION: lima
     ENV_VARS: "DEQP_PARALLEL=6"
-    FILES_HOST_NAME: "lava-files.baylibre.com"
   tags:
     - lava-meson-gxl-s905x-libretech-cc