ci: Enable all of GLES3/3.1 testing for softpipe.
Now that we're not using so many job slots, it's easy to get these
jobs run in a reasonable amount of time (gles3 took 10 minutes for 4
cores, and gles31 was 15 minutes for 4 cores).
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83f3346..b7eb604 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -537,19 +537,17 @@
DEQP_SKIPS: deqp-softpipe-skips.txt
GALLIUM_DRIVER: "softpipe"
-# The GLES2 CTS run takes about 8 minutes of CPU time, while GLES3 is
-# 25 minutes. Until we can get its runtime down, just do a partial
-# (every 10 tests) run.
-test-softpipe-gles3-limited:
+test-softpipe-gles3:
+ parallel: 2
variables:
DEQP_VER: gles3
- DEQP_PARALLEL: 4
- DEQP_EXPECTED_FAILS: deqp-softpipe-fails.txt
- LIBGL_ALWAYS_SOFTWARE: "true"
- GALLIUM_DRIVER: "softpipe"
- CI_NODE_INDEX: 1
- CI_NODE_TOTAL: 10
- extends: .deqp-test
+ extends: test-softpipe-gles2
+
+test-softpipe-gles31:
+ parallel: 4
+ variables:
+ DEQP_VER: gles31
+ extends: test-softpipe-gles2
arm64_a630_gles2:
extends: .deqp-test