X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci%2Flava-deqp.yml.jinja2;h=93cc6c20d1aa0dd345f3afffaf83aba10a05d1a9;hb=70cbddc4a7967c8889f8b10d8a31d7b8bdbde2fb;hp=c974a66788d2fe8fcfdad89d4d4eeb9d2f42b995;hpb=22d976454f4e50142116f4544c0bbf11134ce991;p=mesa.git

diff --git a/.gitlab-ci/lava-deqp.yml.jinja2 b/.gitlab-ci/lava-deqp.yml.jinja2
index c974a66788d..93cc6c20d1a 100644
--- a/.gitlab-ci/lava-deqp.yml.jinja2
+++ b/.gitlab-ci/lava-deqp.yml.jinja2
@@ -1,5 +1,7 @@
-job_name: mesa-deqp-{{ gpu_version }}
+job_name: mesa-deqp-{{ deqp_version }}-{{ gpu_version }} {{ pipeline_info }}
 device_type: {{ device_type }}
+context:
+  extra_nfsroot_args: " init=/init rootwait"
 timeouts:
   job:
     minutes: 40
@@ -11,8 +13,9 @@ timeouts:
 priority: 75
 visibility: public
 {% if tags %}
+{% set lavatags = tags.split(',') %}
 tags:
-{% for tag in tags %}
+{% for tag in lavatags %}
   - {{ tag }}
 {% endfor %}
 {% endif %}
@@ -26,19 +29,31 @@ actions:
 {% if kernel_image_type %}
       {{ kernel_image_type }}
 {% endif %}
-    ramdisk:
-      url: {{ base_artifacts_url }}/lava-rootfs-{{ arch }}.cpio.gz
+    nfsrootfs:
+      url: {{ base_artifacts_url }}/lava-rootfs.tgz
       compression: gz
+{% if dtb %}
     dtb:
-      url: {{ base_artifacts_url }}/{{ device_type }}.dtb
+      url: {{ base_artifacts_url }}/{{ dtb }}.dtb
+{% endif %}
     os: oe
 - boot:
     timeout:
       minutes: 5
     method: {{ boot_method }}
-    commands: ramdisk
+{% 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: nfs
+{% endif %}
     prompts:
-      - '#' 
+      - 'lava-shell:'
 - test:
     timeout:
       minutes: 60
@@ -56,30 +71,32 @@ 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
+          - echo "nameserver 8.8.8.8" > /etc/resolv.conf
+          - for i in 1 2 3; do sntp -sS pool.ntp.org && break || sleep 2; done
+
+          # amdgpu failed to find its firmware during boot, rebind
+          - echo 0000:00:01.0 > /sys/bus/pci/drivers/amdgpu/bind || true
 
 {% if env_vars %}
           - export {{ env_vars }}
 {% endif %}
 
+          # deqp-runner.sh assumes some stuff is in pwd
+          - cd /
+
+          - wget -S --progress=dot:giga -O- {{ mesa_url }} | tar -xz
+
           - export DEQP_NO_SAVE_RESULTS=1
-          - 'export DEQP_RUNNER_OPTIONS="--compact-display false --shuffle false"'
+          - 'export DEQP_RUNNER_OPTIONS="--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
+          - "if sh /install/deqp-runner.sh; then
                   echo 'deqp: pass';
              else
                   echo 'deqp: fail';