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

[mesa.git] / .gitlab-ci / lava-gitlab-ci.yml

diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 9b254e4579be1c5762680e3a6b55c890a9d720e9..2eea316deebd606322ee111d84525e70d7212855 100644 (file)
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -6,12 +6,18 @@
     ENV_VARS: "DEQP_PARALLEL=6"
     DEQP_VERSION: gles2
   script:
-    - BUILD_JOB_ID=`cat artifacts/build_job_id.txt`
+    - mkdir -p /srv/${FILES_HOST_NAME}/$CI_JOB_ID/
+    - cp /lava-files/${KERNEL_IMAGE_NAME} /srv/${FILES_HOST_NAME}/$CI_JOB_ID/.
+    - cp /lava-files/${DEVICE_TYPE}.dtb /srv/${FILES_HOST_NAME}/$CI_JOB_ID/.
+    - tar -C /lava-files/rootfs-${ARCH} -xf artifacts/install.tar
+    - pushd /lava-files/rootfs-${ARCH}
+    - find -H  |  cpio -H newc -o | gzip -c - > /srv/${FILES_HOST_NAME}/$CI_JOB_ID/lava-rootfs-${ARCH}.cpio.gz
+    - popd
     - >
       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 $CI_PROJECT_URL/-/jobs/$BUILD_JOB_ID/artifacts/raw/artifacts \
+        --base-artifacts-url ${FILES_HOST_URL}/$CI_JOB_ID \
         --device-type ${DEVICE_TYPE} \
         --env-vars "${ENV_VARS}" \
         --arch ${ARCH} \
@@ -23,7 +29,7 @@
         --lava-tags "${LAVA_TAGS}" \
         --ci-node-index "${CI_NODE_INDEX}" \
         --ci-node-total "${CI_NODE_TOTAL}"
-    - lava_job_id=`lavacli jobs submit lava-deqp.yml`
+    - lava_job_id=`lavacli jobs submit lava-deqp.yml` || lavacli jobs submit lava-deqp.yml
     - echo $lava_job_id
     - rm -rf artifacts/*
     - cp lava-deqp.yml artifacts/.
@@ -32,7 +38,10 @@
     - result=`lavacli results $lava_job_id 0_deqp deqp | head -1`
     - echo $result
     - '[[ "$result" == "pass" ]]'
+  after_script:
+    - rm -rf /srv/${FILES_HOST_NAME}/$CI_JOB_ID/
   artifacts:
+    name: "mesa_${CI_JOB_NAME}"
     when: always
     paths:
       - artifacts/
@@ -66,42 +75,52 @@
     - meson-arm64
 
 panfrost-t720-gles2:arm64:
-  extends: .lava-test:arm64
-  stage: panfrost
+  extends:
+    - .lava-test:arm64
+    - .panfrost-rules
   variables:
     DEVICE_TYPE: sun50i-h6-pine-h64
     GPU_VERSION: panfrost-t720
     ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6"
+    FILES_HOST_NAME: "mesa-ci-lava-files.freedesktop.org"
+    FILES_HOST_URL: "https://mesa-ci-lava-files.freedesktop.org"
   tags:
-    - lava-sun50i-h6-pine-h64
+    - mesa-ci-aarch64-lava-collabora
 
 panfrost-t760-gles2:armhf:
-  extends: .lava-test:armhf
-  stage: panfrost
+  extends:
+    - .lava-test:armhf
+    - .panfrost-rules
   variables:
     DEVICE_TYPE: rk3288-veyron-jaq
     GPU_VERSION: panfrost-t760
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
     ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6"
+    FILES_HOST_NAME: "mesa-ci-lava-files.freedesktop.org"
+    FILES_HOST_URL: "https://mesa-ci-lava-files.freedesktop.org"
   tags:
-    - lava-rk3288-veyron-jaq
+    - mesa-ci-aarch64-lava-collabora
 
 panfrost-t860-gles2:arm64:
-  extends: .lava-test:arm64
-  stage: panfrost
+  extends:
+    - .lava-test:arm64
+    - .panfrost-rules
   variables:
     DEVICE_TYPE: rk3399-gru-kevin
     GPU_VERSION: panfrost-t860
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
     ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6"
+    FILES_HOST_NAME: "mesa-ci-lava-files.freedesktop.org"
+    FILES_HOST_URL: "https://mesa-ci-lava-files.freedesktop.org"
   tags:
-    - lava-rk3399-gru-kevin
+    - mesa-ci-aarch64-lava-collabora
 
 panfrost-t860-gles3:arm64:
-  extends: .lava-test:arm64
-  stage: panfrost
+  extends:
+    - .lava-test:arm64
+    - .panfrost-rules
   variables:
     DEVICE_TYPE: rk3399-gru-kevin
     GPU_VERSION: panfrost-t860
@@ -111,55 +130,42 @@ panfrost-t860-gles3:arm64:
     ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6"
     CI_NODE_INDEX: 1
     CI_NODE_TOTAL: 5
+    FILES_HOST_NAME: "mesa-ci-lava-files.freedesktop.org"
+    FILES_HOST_URL: "https://mesa-ci-lava-files.freedesktop.org"
   tags:
-    - lava-rk3399-gru-kevin
+    - mesa-ci-aarch64-lava-collabora
 
-.panfrost-t820-gles2:arm64:
-  extends: .lava-test:arm64
-  stage: panfrost
+panfrost-t820-gles2:arm64:
+  extends:
+    - .lava-test:arm64
+    - .panfrost-rules
   variables:
     DEVICE_TYPE: meson-gxm-khadas-vim2
     GPU_VERSION: panfrost-t820
     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
-  stage: misc-tests
+  extends:
+    - .lava-test:armhf
+    - .lima-rules
   variables:
     DEVICE_TYPE: sun8i-h3-libretech-all-h3-cc
     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:
-  extends: .lava-test:arm64
-  stage: misc-tests
+  extends:
+    - .lava-test:arm64
+    - .lima-rules
   variables:
     DEVICE_TYPE: meson-gxl-s905x-libretech-cc
     GPU_VERSION: lima
     ENV_VARS: "DEQP_PARALLEL=6"
   tags:
-    - lava-meson-gxl-s905x-libretech-cc
-
-.freedreno-a307-gles2:
-  extends: .lava-test:arm64
-  stage: freedreno
-  variables:
-    DEVICE_TYPE: apq8016-sbc
-    GPU_VERSION: freedreno-a307
-    ENV_VARS: "DEQP_PARALLEL=4"
-    KERNEL_IMAGE_NAME: db410c.img
-    BOOT_METHOD: fastboot
-  tags:
-    - lava-mesa-db410c
-
-.freedreno-a307-gles3:
-  parallel: 6
-  extends: .freedreno-a307-gles2
-  variables:
-    DEQP_VERSION: gles3
+    - mesa-ci-aarch64-lava-baylibre