From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Wed, 19 Aug 2020 07:55:47 +0000 (+0200)
Subject: ci: Run deqp-gles2 on RadeonSI
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6c9cf84409bfc046b80c8da44b4a3f805b225a5a;p=mesa.git

ci: Run deqp-gles2 on RadeonSI

We have one more DUT in the Collabora lab, use it to run GLES2 tests.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6385>
---

diff --git a/.gitlab-ci/lava-deqp.yml.jinja2 b/.gitlab-ci/lava-deqp.yml.jinja2
index d5c0a2c6cf7..93cc6c20d1a 100644
--- a/.gitlab-ci/lava-deqp.yml.jinja2
+++ b/.gitlab-ci/lava-deqp.yml.jinja2
@@ -77,6 +77,8 @@ actions:
           - 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 }}
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index a6ac47c6480..b16125fbb15 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -264,8 +264,7 @@ panfrost-t860-traces:arm64:
   tags:
     - mesa-ci-aarch64-lava-baylibre
 
-# Commented out while waiting for more DUTs to come online
-.radeonsi-stoney-gles2:amd64:
+radeonsi-stoney-gles2:amd64:
   extends:
     - .lava-test:amd64
     - .radeonsi-rules
@@ -282,7 +281,7 @@ panfrost-t860-traces:arm64:
 # Commented out while waiting for more DUTs to come online
 .radeonsi-stoney-gles3:amd64:
   extends:
-    - .radeonsi-stoney-gles2:amd64
+    - radeonsi-stoney-gles2:amd64
   variables:
     DEQP_VERSION: gles3
   tags: