Mesa (master): gitlab-ci: reduce a630 runner load

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: f076c36367fddfb049b54746b5637c1444ce230f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f076c36367fddfb049b54746b5637c1444ce230f

Author: Rob Clark <robdclark at chromium.org>
Date:   Mon Jul 13 19:00:57 2020 -0700

gitlab-ci: reduce a630 runner load

They seem to be sometimes taking a while to boot, which is triggering CI
timeouts.  (Possibly tftp server in bad shape?)  Cut out non-essential
a630 CI jobs, and reduce the gles3/gles31 jobs to compensate.

Signed-off-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5893>

---

 .gitlab-ci.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd80adb36d7..51f06898ab7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1051,6 +1051,8 @@ arm64_a630_gles2:
 arm64_a630_gles31:
   extends: arm64_a630_gles2
   variables:
+    CI_NODE_INDEX: 1
+    CI_NODE_TOTAL: 2
     DEQP_VER: gles31
     # gles31 is about 12 minutes with validation enabled.
     NIR_VALIDATE: 0
@@ -1058,13 +1060,15 @@ arm64_a630_gles31:
 arm64_a630_gles3:
   extends: arm64_a630_gles2
   variables:
+    CI_NODE_INDEX: 1
+    CI_NODE_TOTAL: 2
     DEQP_VER: gles3
     # gles3 is about 15 minutes with validation enabled.
     NIR_VALIDATE: 0
 
 # We almost always manage to lower UBOs back to constant uploads in
 # the test suite, so get a little testing for it here.
-arm64_a630_noubo:
+.arm64_a630_noubo:
   extends: arm64_a630_gles31
   variables:
     DEQP_VER: gles31
@@ -1074,7 +1078,7 @@ arm64_a630_noubo:
 # The driver does some guessing as to whether to render using gmem
 # or bypass, and some GLES3.1 features interact with either one.
 # Do a little testing with gmem and bypass forced.
-arm64_a630_bypass:
+.arm64_a630_bypass:
   extends: arm64_a630_gles31
   variables:
     CI_NODE_INDEX: 1
@@ -1082,7 +1086,7 @@ arm64_a630_bypass:
     FD_MESA_DEBUG: nogmem
     DEQP_EXPECTED_FAILS: deqp-freedreno-a630-bypass-fails.txt
 
-arm64_a630_traces:
+.arm64_a630_traces:
   extends:
     - arm64_a630_gles2
   variables:
@@ -1097,7 +1101,7 @@ arm64_a630_traces:
 # Along with checking gmem path, check that we don't get obvious nir
 # validation failures (though it's too expensive to have it on for the
 # full CTS)
-arm64_a630_gmem:
+.arm64_a630_gmem:
   extends: arm64_a630_gles31
   variables:
     CI_NODE_INDEX: 1
@@ -1105,7 +1109,7 @@ arm64_a630_gmem:
     FD_MESA_DEBUG: nobypass
     NIR_VALIDATE: 1
 
-arm64_a630_vk:
+.arm64_a630_vk:
   extends: arm64_a630_gles2
   variables:
     DEQP_VER: vk
@@ -1121,9 +1125,9 @@ arm64_a630_vk:
 # Do a separate sysmem pass over the testcases that really affect sysmem
 # rendering.  This is currently very flaky, leave it as an option for devs
 # to click play on in their branches.
-arm64_a630_vk_sysmem:
+.arm64_a630_vk_sysmem:
   extends:
-    - arm64_a630_vk
+    - .arm64_a630_vk
   variables:
     CI_NODE_INDEX: 1
     CI_NODE_TOTAL: 10