panfrost: Compact the bo_access readers array

[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 3c63921ca11221050f33735b4a8002c254b3c4cb..c974a66788d2fe8fcfdad89d4d4eeb9d2f42b995 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 }}
+device_type: {{ device_type }}
 timeouts:
   job:
     minutes: 40
@@ -10,6 +10,12 @@ timeouts:
       seconds: 30
 priority: 75
 visibility: public
+{% if tags %}
+tags:
+{% for tag in tags %}
+  - {{ tag }}
+{% endfor %}
+{% endif %}
 actions:
 - deploy:
     timeout:
@@ -17,7 +23,9 @@ actions:
     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
@@ -51,8 +59,31 @@ actions:
           - mount -t devtmpfs none /dev
           - mkdir -p /dev/pts
           - mount -t devpts devpts /dev/pts
-          - sh /deqp/lava-deqp-runner.sh {{ gpu_version }}
-          - cat /proc/loadavg
+
+{% if env_vars %}
+          - export {{ env_vars }}
+{% endif %}
+
+          - export DEQP_NO_SAVE_RESULTS=1
+          - 'export DEQP_RUNNER_OPTIONS="--compact-display false --shuffle false"'
+          - 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
+                  echo 'deqp: pass';
+             else
+                  echo 'deqp: fail';
+             fi"
         parse:
           pattern: '(?P<test_case_id>\S*):\s+(?P<result>(pass|fail))'
       from: inline