gitlab-ci: Distribute jobs across more stages

The stages and mapping of jobs to them are somewhat arbitrary; the goal
is to avoid having to scroll through large numbers of jobs.

v2: (Pierre-Eric Pelloux-Prayer)
* Use even more stages for test jobs
* Give somewhat meaningful names to stages

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3995>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3995>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ac82357d03d3fb1b9f2b8ed695b7b460f19a584..3beed8d49827ee7b4e453e80d72ae2008f399666 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,8 +9,14 @@ include:
 
 stages:
   - container
-  - build
-  - test
+  - meson-x86_64
+  - scons
+  - meson-misc
+  - llvmpipe
+  - softpipe
+  - freedreno
+  - panfrost
+  - misc-tests
   - success
 
 
@@ -194,7 +200,6 @@ arm_test:
 # Shared between windows and Linux
 .build-common:
   extends: .ci-run-policy
-  stage: build
   artifacts:
     when: always
     paths:
@@ -231,6 +236,7 @@ arm_test:
   extends:
     - .build-linux
     - .use-x86_build
+  stage: meson-x86_64
   variables:
     LLVM_VERSION: 9
   script:
@@ -240,6 +246,7 @@ arm_test:
   extends:
     - .build-linux
     - .use-x86_build
+  stage: scons
   variables:
     SCONSFLAGS: "-j4"
   script:
@@ -298,6 +305,7 @@ meson-main:
 .meson-cross:
   extends:
     - .meson-build
+  stage: meson-misc
   variables:
     UNWIND: "false"
     DRI_LOADERS: >
@@ -376,6 +384,7 @@ meson-clang:
 .meson-windows:
   extends:
     - .build-windows
+  stage: meson-misc
   before_script:
     - $ENV:ARCH = "x86"
     - $ENV:VERSION = "2019\Community"
@@ -503,6 +512,7 @@ meson-ppc64el:
 
 meson-mingw32-x86_64:
   extends: .meson-build
+  stage: meson-misc
   variables:
     UNWIND: "false"
     DRI_DRIVERS: ""
@@ -531,7 +541,6 @@ scons-old-llvm:
 .test:
   extends:
     - .ci-run-policy
-  stage: test
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
   before_script:
@@ -569,6 +578,7 @@ scons-old-llvm:
 
 .piglit-test:
   extends: .test-gl
+  stage: llvmpipe
   artifacts:
     when: on_failure
     name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
@@ -640,9 +650,11 @@ llvmpipe-gles2:
     DEQP_EXPECTED_FAILS: deqp-llvmpipe-fails.txt
     LIBGL_ALWAYS_SOFTWARE: "true"
   extends: .deqp-test-gl
+  stage: llvmpipe
 
 softpipe-gles2:
   extends: llvmpipe-gles2
+  stage: softpipe
   variables:
     DEQP_EXPECTED_FAILS: deqp-softpipe-fails.txt
     DEQP_SKIPS: deqp-softpipe-skips.txt
@@ -664,6 +676,7 @@ arm64_a630_gles2:
   extends:
     - .deqp-test-gl
     - .use-arm_test
+  stage: freedreno
   variables:
     DEQP_VER: gles2
     DEQP_EXPECTED_FAILS: deqp-freedreno-a630-fails.txt
@@ -696,6 +709,7 @@ arm64_a306_gles2:
 
 # RADV CI
 .test-radv:
+  stage: misc-tests
   variables:
     VK_DRIVER: radeon
     RADV_DEBUG: checkir
@@ -724,6 +738,7 @@ radv_polaris10_vkcts:
 
 # Traces CI
 .traces-test:
+  stage: misc-tests
   cache:
     key: ${CI_JOB_NAME}
     paths:

diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 64d84ada31d2d23e2eda3deb34649ccbc8147b62..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,6 +67,7 @@
 
 panfrost-t720-gles2:arm64:
   extends: .lava-test:arm64
+  stage: panfrost
   variables:
     DEVICE_TYPE: sun50i-h6-pine-h64
     GPU_VERSION: panfrost-t720
@@ -77,6 +77,7 @@ panfrost-t720-gles2:arm64:
 
 panfrost-t760-gles2:armhf:
   extends: .lava-test:armhf
+  stage: panfrost
   variables:
     DEVICE_TYPE: rk3288-veyron-jaq
     GPU_VERSION: panfrost-t760
@@ -88,6 +89,7 @@ panfrost-t760-gles2:armhf:
 
 panfrost-t860-gles2:arm64:
   extends: .lava-test:arm64
+  stage: panfrost
   variables:
     DEVICE_TYPE: rk3399-gru-kevin
     GPU_VERSION: panfrost-t860
@@ -99,6 +101,7 @@ panfrost-t860-gles2:arm64:
 
 panfrost-t860-gles3:arm64:
   extends: .lava-test:arm64
+  stage: panfrost
   variables:
     DEVICE_TYPE: rk3399-gru-kevin
     GPU_VERSION: panfrost-t860
@@ -113,6 +116,7 @@ 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
@@ -124,6 +128,7 @@ panfrost-t860-gles3:arm64:
 .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,6 +138,7 @@ 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
@@ -142,6 +148,7 @@ lima-mali450-test:arm64:
 
 .freedreno-a307-gles2:
   extends: .lava-test:arm64
+  stage: freedreno
   variables:
     DEVICE_TYPE: apq8016-sbc
     GPU_VERSION: freedreno-a307