gitlab-ci: Distribute jobs across more stages

[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 72337edf8ea38f9b0cbf5dd54cde0ce0cfea78c5..9b254e4579be1c5762680e3a6b55c890a9d720e9 100644 (file)
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -1,7 +1,6 @@
 .lava-test:
   extends:
     - .ci-run-policy
-  stage: test
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
     ENV_VARS: "DEQP_PARALLEL=6"
@@ -68,44 +67,48 @@
 
 panfrost-t720-gles2:arm64:
   extends: .lava-test:arm64
+  stage: panfrost
   variables:
     DEVICE_TYPE: sun50i-h6-pine-h64
     GPU_VERSION: panfrost-t720
-    ENV_VARS: "MESA_GLES_VERSION_OVERRIDE=3.0 DEQP_PARALLEL=6"
+    ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6"
   tags:
     - lava-sun50i-h6-pine-h64
 
 panfrost-t760-gles2:armhf:
   extends: .lava-test:armhf
+  stage: panfrost
   variables:
     DEVICE_TYPE: rk3288-veyron-jaq
     GPU_VERSION: panfrost-t760
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
-    ENV_VARS: "MESA_GLES_VERSION_OVERRIDE=3.0 DEQP_PARALLEL=6"
+    ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6"
   tags:
     - lava-rk3288-veyron-jaq
 
 panfrost-t860-gles2:arm64:
   extends: .lava-test:arm64
+  stage: panfrost
   variables:
     DEVICE_TYPE: rk3399-gru-kevin
     GPU_VERSION: panfrost-t860
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
-    ENV_VARS: "MESA_GLES_VERSION_OVERRIDE=3.0 DEQP_PARALLEL=6"
+    ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6"
   tags:
     - lava-rk3399-gru-kevin
 
 panfrost-t860-gles3:arm64:
   extends: .lava-test:arm64
+  stage: panfrost
   variables:
     DEVICE_TYPE: rk3399-gru-kevin
     GPU_VERSION: panfrost-t860
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
     DEQP_VERSION: gles3
-    ENV_VARS: "MESA_GLES_VERSION_OVERRIDE=3.0 MESA_GLSL_VERSION_OVERRIDE=300 PAN_MESA_DEBUG=deqp DEQP_PARALLEL=6"
+    ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6"
     CI_NODE_INDEX: 1
     CI_NODE_TOTAL: 5
   tags:
@@ -113,17 +116,19 @@ panfrost-t860-gles3:arm64:
 
 .panfrost-t820-gles2:arm64:
   extends: .lava-test:arm64
+  stage: panfrost
   variables:
     DEVICE_TYPE: meson-gxm-khadas-vim2
     GPU_VERSION: panfrost-t820
     LAVA_TAGS: panfrost
-    ENV_VARS: "MESA_GLES_VERSION_OVERRIDE=3.0 DEQP_PARALLEL=6"
+    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
+  stage: misc-tests
   variables:
     DEVICE_TYPE: sun8i-h3-libretech-all-h3-cc
     GPU_VERSION: lima
@@ -133,9 +138,28 @@ panfrost-t860-gles3:arm64:
 
 lima-mali450-test:arm64:
   extends: .lava-test:arm64
+  stage: misc-tests
   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
+  stage: freedreno
+  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