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

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

diff --git a/.gitlab-ci/lava-deqp.yml.jinja2 b/.gitlab-ci/lava-deqp.yml.jinja2
index 55b87ba61237744ffb997921960caea56853d967..e7d980ec0ccbcaaf447a70179c46747ec689e440 100644 (file)
--- a/.gitlab-ci/lava-deqp.yml.jinja2
+++ b/.gitlab-ci/lava-deqp.yml.jinja2
@@ -1,5 +1,5 @@
-job_name: mesa-deqp-{{ gpu_version }}
-device_type: {{ lava_device_type }}
+job_name: mesa-deqp-{{ deqp_version }}-{{ gpu_version }} {{ pipeline_info }}
+device_type: {{ device_type }}
 timeouts:
   job:
     minutes: 40
@@ -11,8 +11,9 @@ timeouts:
 priority: 75
 visibility: public
 {% if tags %}
+{% set lavatags = tags.split(',') %}
 tags:
-{% for tag in tags %}
+{% for tag in lavatags %}
   - {{ tag }}
 {% endfor %}
 {% endif %}
@@ -20,23 +21,43 @@ actions:
 - deploy:
     timeout:
       minutes: 10
+{% if boot_method == "fastboot" %}
+{# fastboot has just one boot image with the dtb and rootfs packed in #}
+    to: fastboot
+    images:
+      boot:
+        url: {{ base_artifacts_url }}/{{ kernel_image_name }}
+{% else %}
     to: tftp
     kernel:
       url: {{ base_artifacts_url }}/{{ kernel_image_name }}
+{% if kernel_image_type %}
       {{ kernel_image_type }}
+{% endif %}
     ramdisk:
       url: {{ base_artifacts_url }}/lava-rootfs-{{ arch }}.cpio.gz
       compression: gz
     dtb:
       url: {{ base_artifacts_url }}/{{ device_type }}.dtb
+{% endif %}
     os: oe
 - boot:
     timeout:
       minutes: 5
     method: {{ boot_method }}
+{% if boot_method == "fastboot" %}
+{#
+   For fastboot, LAVA doesn't know how to unpack the rootfs/apply overlay/repack,
+   so we transfer the overlay over the network after boot.
+#}
+    transfer_overlay:
+      download_command: wget -S --progress=dot:giga
+      unpack_command: tar -C / -xzf
+{% else %}
     commands: ramdisk
+{% endif %}
     prompts:
-      - '#' 
+      - 'lava-shell:'
 - test:
     timeout:
       minutes: 60
@@ -54,28 +75,25 @@ actions:
           steps:
           - mount -t proc none /proc
           - mount -t sysfs none /sys 
-          - mount -t devtmpfs none /dev
+          - mount -t devtmpfs none /dev || echo possibly already mounted
           - mkdir -p /dev/pts
           - mount -t devpts devpts /dev/pts
 
-          - export MESA_GLES_VERSION_OVERRIDE=3.0
-          - export DEQP_PARALLEL=6
+{% if env_vars %}
+          - export {{ env_vars }}
+{% endif %}
+
+          # deqp-runner.sh assumes some stuff is in pwd
+          - cd /
+
           - export DEQP_NO_SAVE_RESULTS=1
           - 'export DEQP_RUNNER_OPTIONS="--compact-display false --shuffle false"'
-          - export DEQP_EXPECTED_FAILS={{ fails_file }}
-          - export DEQP_SKIPS={{ skips_file }}
+          - export DEQP_EXPECTED_FAILS=deqp-{{ gpu_version }}-fails.txt
+          - export DEQP_SKIPS=deqp-{{ gpu_version }}-skips.txt
           - export DEQP_VER={{ deqp_version }}
           - export LIBGL_DRIVERS_PATH=`pwd`/install/lib/dri
 
-          # Put stuff where the runner script expects it
-          - mkdir artifacts
-          - mkdir results
-          - mkdir -p install/lib
-          - cp /deqp/$DEQP_EXPECTED_FAILS artifacts/.
-          - cp /deqp/$DEQP_SKIPS artifacts/.
-          - mv /mesa/lib/* install/lib/.
-
-          - "if sh /deqp/deqp-runner.sh; then
+          - "if sh /install/deqp-runner.sh; then
                   echo 'deqp: pass';
              else
                   echo 'deqp: fail';