X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci%2Flava-gitlab-ci.yml;h=3df5894d7cea0a96994660549a94c846e41479e3;hb=6c1c2b779abfda8c7271240f24e92cb6970106a3;hp=1b8480e18ae73d157b49ac77ec7b093aa77298a7;hpb=f8ab00776cc0b2a009403a8611c00341d879f9ab;p=mesa.git

diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 1b8480e18ae..3df5894d7ce 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -1,10 +1,10 @@
 .lava-test:
   extends:
     - .ci-run-policy
-  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 +15,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} \
@@ -33,6 +33,7 @@
     - echo $result
     - '[[ "$result" == "pass" ]]'
   artifacts:
+    name: "mesa_${CI_JOB_NAME}"
     when: always
     paths:
       - artifacts/
@@ -65,46 +66,76 @@
   needs:
     - meson-arm64
 
-panfrost-t720-test:arm64:
-  extends: .lava-test:arm64
+panfrost-t720-gles2:arm64:
+  extends:
+    - .lava-test:arm64
+    - .panfrost-rules
   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:
-  extends: .lava-test:armhf
+panfrost-t760-gles2:armhf:
+  extends:
+    - .lava-test:armhf
+    - .panfrost-rules
   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:
-  extends: .lava-test:arm64
+panfrost-t860-gles2:arm64:
+  extends:
+    - .lava-test:arm64
+    - .panfrost-rules
+  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
+    - .panfrost-rules
   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:
-  extends: .lava-test:arm64
+.panfrost-t820-gles2:arm64:
+  extends:
+    - .lava-test:arm64
+    - .panfrost-rules
   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
 
 .lima-mali400-test:armhf:
   parallel: 2
-  extends: .lava-test:armhf
+  extends:
+    - .lava-test:armhf
+    - .lima-rules
   variables:
     DEVICE_TYPE: sun8i-h3-libretech-all-h3-cc
     GPU_VERSION: lima
@@ -112,11 +143,32 @@ panfrost-t860-test:arm64:
   tags:
     - lava-sun8i-h3-libretech-all-h3-cc
 
-.lima-mali450-test:arm64:
-  extends: .lava-test:arm64
+lima-mali450-test:arm64:
+  extends:
+    - .lava-test:arm64
+    - .lima-rules
   variables:
     DEVICE_TYPE: meson-gxl-s905x-libretech-cc
     GPU_VERSION: lima
     ENV_VARS: "DEQP_PARALLEL=6"
   tags:
     - lava-meson-gxl-s905x-libretech-cc
+
+.freedreno-a307-gles2:
+  extends:
+    - .lava-test:arm64
+    - .freedreno-rules
+  variables:
+    DEVICE_TYPE: apq8016-sbc
+    GPU_VERSION: freedreno-a307
+    ENV_VARS: "DEQP_PARALLEL=4"
+    KERNEL_IMAGE_NAME: db410c.img
+    BOOT_METHOD: fastboot
+  tags:
+    - lava-mesa-db410c
+
+.freedreno-a307-gles3:
+  parallel: 6
+  extends: .freedreno-a307-gles2
+  variables:
+    DEQP_VERSION: gles3