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 f91830fe3bafb49045bca00d67b9582440b4b7b3..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,7 +133,7 @@ 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:
@@ -189,6 +191,7 @@ arm_test:
 .build-common:
   extends: .ci-run-policy
   artifacts:
+    name: "mesa_${CI_JOB_NAME}"
     when: always
     paths:
       - _build/meson-logs/*.txt
@@ -481,8 +484,6 @@ meson-i386:
 meson-s390x:
   extends:
     - .meson-cross
-  tags:
-    - gstreamer
   variables:
     CROSS: s390x
     GALLIUM_DRIVERS: "swrast"
@@ -538,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:
@@ -565,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:
@@ -642,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
@@ -669,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
@@ -702,6 +706,7 @@ arm64_a306_gles2:
 
 # RADV CI
 .test-radv:
+  extends: .radv-rules
   stage: misc-tests
   variables:
     VK_DRIVER: radeon
@@ -764,7 +769,9 @@ radv-polaris10-fossils:
     - ./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"