gitlab-ci: Don't restrict ppc64el/s390x build jobs to gstreamer runners

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3beed8d49827ee7b4e453e80d72ae2008f399666..bcf56ba48538670ccd8e5ad23c1693cab345bffe 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,7 @@ include:
     ref: b7030c2cd0d6ccc5f6d4f8299bafa4daa9240d71
     file: '/templates/debian.yml'
   - local: '.gitlab-ci/lava-gitlab-ci.yml'
+  - local: '.gitlab-ci/test-source-dep.yml'
 
 stages:
   - container
@@ -77,6 +78,7 @@ success:
 
 .ci-deqp-artifacts:
   artifacts:
+    name: "mesa_${CI_JOB_NAME}"
     when: always
     untracked: false
     paths:
@@ -131,25 +133,13 @@ x86_build:
 x86_test-gl:
   extends: x86_build
   variables:
-    DEBIAN_TAG: &x86_test-gl "2020-02-14"
+    DEBIAN_TAG: &x86_test-gl "2020-03-11"
 
 # Debian 10 based x86 test image for VK
 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:
@@ -201,6 +191,7 @@ arm_test:
 .build-common:
   extends: .ci-run-policy
   artifacts:
+    name: "mesa_${CI_JOB_NAME}"
     when: always
     paths:
       - _build/meson-logs/*.txt
@@ -493,8 +484,6 @@ meson-i386:
 meson-s390x:
   extends:
     - .meson-cross
-  tags:
-    - gstreamer
   variables:
     CROSS: s390x
     GALLIUM_DRIVERS: "swrast"
@@ -550,7 +539,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:
@@ -577,11 +566,12 @@ scons-old-llvm:
     - x86_test-vk
 
 .piglit-test:
-  extends: .test-gl
-  stage: llvmpipe
+  extends:
+    - .test-gl
+    - .llvmpipe-rules
   artifacts:
     when: on_failure
-    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
+    name: "mesa_${CI_JOB_NAME}"
     paths:
       - summary/
   variables:
@@ -639,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
@@ -649,12 +644,14 @@ llvmpipe-gles2:
     LP_NUM_THREADS: 0
     DEQP_EXPECTED_FAILS: deqp-llvmpipe-fails.txt
     LIBGL_ALWAYS_SOFTWARE: "true"
-  extends: .deqp-test-gl
-  stage: llvmpipe
+  extends:
+    - .deqp-test-gl
+    - .llvmpipe-rules
 
 softpipe-gles2:
-  extends: llvmpipe-gles2
-  stage: softpipe
+  extends:
+    - llvmpipe-gles2
+    - .softpipe-rules
   variables:
     DEQP_EXPECTED_FAILS: deqp-softpipe-fails.txt
     DEQP_SKIPS: deqp-softpipe-skips.txt
@@ -676,7 +673,7 @@ arm64_a630_gles2:
   extends:
     - .deqp-test-gl
     - .use-arm_test
-  stage: freedreno
+    - .freedreno-rules
   variables:
     DEQP_VER: gles2
     DEQP_EXPECTED_FAILS: deqp-freedreno-a630-fails.txt
@@ -709,10 +706,14 @@ arm64_a306_gles2:
 
 # RADV CI
 .test-radv:
+  extends: .radv-rules
   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:
@@ -722,20 +723,29 @@ 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
@@ -759,7 +769,9 @@ radv_polaris10_vkcts:
     - ./artifacts/tracie-runner-vk.sh
 
 llvmpipe-traces:
-  extends: .traces-test-gl
+  extends:
+    - .traces-test-gl
+    - .llvmpipe-rules
   variables:
     LIBGL_ALWAYS_SOFTWARE: "true"
     GALLIUM_DRIVER: "llvmpipe"
@@ -768,7 +780,7 @@ llvmpipe-traces:
 radv-polaris10-traces:
   extends:
     - .traces-test-vk
-    - .test-radv
+    - .test-radv-unsafe
   variables:
     DEVICE_NAME: "vk-amd-polaris10"
   tags: