gitlab-ci: Always name artifacts archive after the job producing it

[mesa.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ac82357d03d3fb1b9f2b8ed695b7b460f19a584..56b9a7606c0d5d7c0dc770661490030390d0c419 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
 
 
@@ -71,6 +77,7 @@ success:
 
 .ci-deqp-artifacts:
   artifacts:
+    name: "mesa_${CI_JOB_NAME}"
     when: always
     untracked: false
     paths:
@@ -131,19 +138,7 @@ x86_test-gl:
 x86_test-vk:
   extends: x86_build
   variables:
-    DEBIAN_TAG: &x86_test-vk "2020-03-04"
-  # Can only be triggered manually on personal branches because RADV is the only
-  # driver that does Vulkan testing at the moment.
-  rules:
-    # Never build the test image for VK by default in the main project.
-    - if: '$CI_PROJECT_PATH == "mesa/mesa"'
-      when: never
-    # Never build the test image for VK by default for merge requests.
-    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME'
-      when: never
-    # Otherwise, allow building it manually for personal branches.
-    - when: manual
-
+    DEBIAN_TAG: &x86_test-vk "2020-03-05"
 
 # Debian 9 based x86 build image (old LLVM)
 x86_build_old:
@@ -194,8 +189,8 @@ arm_test:
 # Shared between windows and Linux
 .build-common:
   extends: .ci-run-policy
-  stage: build
   artifacts:
+    name: "mesa_${CI_JOB_NAME}"
     when: always
     paths:
       - _build/meson-logs/*.txt
@@ -231,6 +226,7 @@ arm_test:
   extends:
     - .build-linux
     - .use-x86_build
+  stage: meson-x86_64
   variables:
     LLVM_VERSION: 9
   script:
@@ -240,6 +236,7 @@ arm_test:
   extends:
     - .build-linux
     - .use-x86_build
+  stage: scons
   variables:
     SCONSFLAGS: "-j4"
   script:
@@ -298,6 +295,7 @@ meson-main:
 .meson-cross:
   extends:
     - .meson-build
+  stage: meson-misc
   variables:
     UNWIND: "false"
     DRI_LOADERS: >
@@ -376,6 +374,7 @@ meson-clang:
 .meson-windows:
   extends:
     - .build-windows
+  stage: meson-misc
   before_script:
     - $ENV:ARCH = "x86"
     - $ENV:VERSION = "2019\Community"
@@ -503,6 +502,7 @@ meson-ppc64el:
 
 meson-mingw32-x86_64:
   extends: .meson-build
+  stage: meson-misc
   variables:
     UNWIND: "false"
     DRI_DRIVERS: ""
@@ -531,7 +531,6 @@ scons-old-llvm:
 .test:
   extends:
     - .ci-run-policy
-  stage: test
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
   before_script:
@@ -541,7 +540,7 @@ scons-old-llvm:
     - LD_LIBRARY_PATH=install/lib find install/lib -name "*.so" -print -exec ldd {} \;
   artifacts:
     when: always
-    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
+    name: "mesa_${CI_JOB_NAME}"
     paths:
       - results/
   dependencies:
@@ -569,9 +568,10 @@ scons-old-llvm:
 
 .piglit-test:
   extends: .test-gl
+  stage: llvmpipe
   artifacts:
     when: on_failure
-    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
+    name: "mesa_${CI_JOB_NAME}"
     paths:
       - summary/
   variables:
@@ -629,6 +629,11 @@ piglit-quick_shader:
   variables:
     DEQP_VER: vk
 
+.fossilize-test:
+  extends: .test-vk
+  script:
+    - ./artifacts/fossilize-runner.sh
+
 llvmpipe-gles2:
   variables:
     DEQP_VER: gles2
@@ -640,9 +645,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 +671,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,9 +704,13 @@ arm64_a306_gles2:
 
 # RADV CI
 .test-radv:
+  stage: misc-tests
   variables:
     VK_DRIVER: radeon
     RADV_DEBUG: checkir
+
+.test-radv-unsafe:
+  extends: .test-radv
   # Can only be triggered manually on personal branches because RADV is the only
   # driver that does Vulkan testing at the moment.
   rules:
@@ -708,22 +720,32 @@ arm64_a306_gles2:
     # Never test RADV by default for merge requests.
     - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME'
       when: never
-    # Otherwise, allow testing RADV if the test image for VK has been manually
-    # started.
-    - when: on_success
+    # Otherwise, allow testing RADV manually for personal branches.
+    - when: manual
+
+.test-radv-fossilize:
+  extends:
+    - .fossilize-test
+    - .test-radv
 
 radv_polaris10_vkcts:
   extends:
     - .deqp-test-vk
-    - .test-radv
+    - .test-radv-unsafe
   variables:
     DEQP_PARALLEL: 4
     DEQP_SKIPS: deqp-radv-polaris10-skips.txt
   tags:
     - polaris10
 
+radv-polaris10-fossils:
+  extends: .test-radv-fossilize
+  variables:
+    RADV_FORCE_FAMILY: "polaris10" # Force creating a null device
+
 # Traces CI
 .traces-test:
+  stage: misc-tests
   cache:
     key: ${CI_JOB_NAME}
     paths:
@@ -753,7 +775,7 @@ llvmpipe-traces:
 radv-polaris10-traces:
   extends:
     - .traces-test-vk
-    - .test-radv
+    - .test-radv-unsafe
   variables:
     DEVICE_NAME: "vk-amd-polaris10"
   tags: