gitlab-ci: Skip dEQP-GLES3.functional.shaders.derivate.*

[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 3914f10adb691f07588531fbf914197deb73f2fc..ea67546aac46eccb9790769a7ff077ca7ba19db2 100644 (file)
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -4,7 +4,8 @@
   stage: test
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
-    ENV_VARS: "MESA_GLES_VERSION_OVERRIDE=3.0 DEQP_PARALLEL=6"
+    ENV_VARS: "DEQP_PARALLEL=6"
+    DEQP_VERSION: gles2
   script:
     - BUILD_JOB_ID=`cat artifacts/build_job_id.txt`
     - >
@@ -15,7 +16,7 @@
         --device-type ${DEVICE_TYPE} \
         --env-vars "${ENV_VARS}" \
         --arch ${ARCH} \
-        --deqp-version gles2 \
+        --deqp-version ${DEQP_VERSION} \
         --kernel-image-name ${KERNEL_IMAGE_NAME} \
         --kernel-image-type "${KERNEL_IMAGE_TYPE}" \
         --gpu-version ${GPU_VERSION} \
@@ -27,7 +28,7 @@
     - echo $lava_job_id
     - rm -rf artifacts/*
     - cp lava-deqp.yml artifacts/.
-    - lavacli jobs logs $lava_job_id | grep -a -v "{'case':" | tee artifacts/lava-deqp-$lava_job_id.log
+    - lavacli jobs logs $lava_job_id | tee artifacts/lava-deqp-$lava_job_id.log
     - lavacli jobs show $lava_job_id
     - result=`lavacli results $lava_job_id 0_deqp deqp | head -1`
     - echo $result
@@ -65,40 +66,58 @@
   needs:
     - meson-arm64
 
-panfrost-t720-test:arm64:
+panfrost-t720-gles2:arm64:
   extends: .lava-test:arm64
   variables:
     DEVICE_TYPE: sun50i-h6-pine-h64
     GPU_VERSION: panfrost-t720
+    ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6"
   tags:
     - lava-sun50i-h6-pine-h64
 
-panfrost-t760-test:armhf:
+panfrost-t760-gles2:armhf:
   extends: .lava-test:armhf
   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"
   tags:
     - lava-rk3288-veyron-jaq
 
-panfrost-t860-test:arm64:
+panfrost-t860-gles2:arm64:
+  extends: .lava-test:arm64
+  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"
+  tags:
+    - lava-rk3399-gru-kevin
+
+panfrost-t860-gles3:arm64:
   extends: .lava-test:arm64
   variables:
     DEVICE_TYPE: rk3399-gru-kevin
     GPU_VERSION: panfrost-t860
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
+    DEQP_VERSION: gles3
+    ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6"
+    CI_NODE_INDEX: 1
+    CI_NODE_TOTAL: 5
   tags:
     - lava-rk3399-gru-kevin
 
-.panfrost-t820-test:arm64:
+.panfrost-t820-gles2:arm64:
   extends: .lava-test:arm64
   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
 
@@ -112,7 +131,7 @@ panfrost-t860-test:arm64:
   tags:
     - lava-sun8i-h3-libretech-all-h3-cc
 
-.lima-mali450-test:arm64:
+lima-mali450-test:arm64:
   extends: .lava-test:arm64
   variables:
     DEVICE_TYPE: meson-gxl-s905x-libretech-cc