gitlab-ci: enable building the test image for VK unconditionally

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a69e6e853b1c17f2f7f85b26d2c13b7143c720e..fe282c62970def9da3aeb0071445b13fbc418ff5 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
 
 
@@ -131,19 +137,7 @@ x86_test-gl:
 x86_test-vk:
   extends: x86_build
   variables:
-    DEBIAN_TAG: &x86_test-vk "2020-02-03"
-  # 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,7 +188,6 @@ arm_test:
 # Shared between windows and Linux
 .build-common:
   extends: .ci-run-policy
-  stage: build
   artifacts:
     when: always
     paths:
@@ -231,6 +224,7 @@ arm_test:
   extends:
     - .build-linux
     - .use-x86_build
+  stage: meson-x86_64
   variables:
     LLVM_VERSION: 9
   script:
@@ -240,6 +234,7 @@ arm_test:
   extends:
     - .build-linux
     - .use-x86_build
+  stage: scons
   variables:
     SCONSFLAGS: "-j4"
   script:
@@ -298,6 +293,7 @@ meson-main:
 .meson-cross:
   extends:
     - .meson-build
+  stage: meson-misc
   variables:
     UNWIND: "false"
     DRI_LOADERS: >
@@ -376,6 +372,7 @@ meson-clang:
 .meson-windows:
   extends:
     - .build-windows
+  stage: meson-misc
   before_script:
     - $ENV:ARCH = "x86"
     - $ENV:VERSION = "2019\Community"
@@ -503,6 +500,7 @@ meson-ppc64el:
 
 meson-mingw32-x86_64:
   extends: .meson-build
+  stage: meson-misc
   variables:
     UNWIND: "false"
     DRI_DRIVERS: ""
@@ -531,7 +529,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 +566,7 @@ scons-old-llvm:
 
 .piglit-test:
   extends: .test-gl
+  stage: llvmpipe
   artifacts:
     when: on_failure
     name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
@@ -629,7 +627,12 @@ piglit-quick_shader:
   variables:
     DEQP_VER: vk
 
-test-llvmpipe-gles2:
+.fossilize-test:
+  extends: .test-vk
+  script:
+    - ./artifacts/fossilize-runner.sh
+
+llvmpipe-gles2:
   variables:
     DEQP_VER: gles2
     DEQP_PARALLEL: 4
@@ -640,30 +643,33 @@ test-llvmpipe-gles2:
     DEQP_EXPECTED_FAILS: deqp-llvmpipe-fails.txt
     LIBGL_ALWAYS_SOFTWARE: "true"
   extends: .deqp-test-gl
+  stage: llvmpipe
 
-test-softpipe-gles2:
-  extends: test-llvmpipe-gles2
+softpipe-gles2:
+  extends: llvmpipe-gles2
+  stage: softpipe
   variables:
     DEQP_EXPECTED_FAILS: deqp-softpipe-fails.txt
     DEQP_SKIPS: deqp-softpipe-skips.txt
     GALLIUM_DRIVER: "softpipe"
 
-test-softpipe-gles3:
+softpipe-gles3:
   parallel: 2
   variables:
     DEQP_VER: gles3
-  extends: test-softpipe-gles2
+  extends: softpipe-gles2
 
-test-softpipe-gles31:
+softpipe-gles31:
   parallel: 4
   variables:
     DEQP_VER: gles31
-  extends: test-softpipe-gles2
+  extends: softpipe-gles2
 
 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 +702,7 @@ arm64_a306_gles2:
 
 # RADV CI
 .test-radv:
+  stage: misc-tests
   variables:
     VK_DRIVER: radeon
     RADV_DEBUG: checkir
@@ -708,9 +715,8 @@ 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
 
 radv_polaris10_vkcts:
   extends:
@@ -722,19 +728,40 @@ radv_polaris10_vkcts:
   tags:
     - polaris10
 
+# Traces CI
 .traces-test:
-  extends:
-    - .test-gl
+  stage: misc-tests
   cache:
     key: ${CI_JOB_NAME}
     paths:
       - .git-lfs-storage/
+
+.traces-test-gl:
+  extends:
+    - .test-gl
+    - .traces-test
+  script:
+    - ./artifacts/tracie-runner-gl.sh
+
+.traces-test-vk:
+  extends:
+    - .test-vk
+    - .traces-test
   script:
-    - ./artifacts/tracie-runner.sh
+    - ./artifacts/tracie-runner-vk.sh
 
 llvmpipe-traces:
+  extends: .traces-test-gl
   variables:
     LIBGL_ALWAYS_SOFTWARE: "true"
     GALLIUM_DRIVER: "llvmpipe"
-    DEVICE_NAME: "vmware-llvmpipe"
-  extends: .traces-test
+    DEVICE_NAME: "gl-vmware-llvmpipe"
+
+radv-polaris10-traces:
+  extends:
+    - .traces-test-vk
+    - .test-radv
+  variables:
+    DEVICE_NAME: "vk-amd-polaris10"
+  tags:
+    - polaris10