ci: Shrink the arm64 kernel build a bit.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d170f33b2e4d86e2e6304facd8d9d01629c082c8..4cfcd312a64344f5e73a6187a80b3de172807fa6 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -112,7 +112,7 @@ x86_build:
     - .debian@container-ifnot-exists
     - .container
   variables:
-    DEBIAN_TAG: &x86_build "2020-02-05"
+    DEBIAN_TAG: &x86_build "2020-02-15"
 
 .use-x86_build:
   variables:
@@ -125,7 +125,7 @@ x86_build:
 x86_test-gl:
   extends: x86_build
   variables:
-    DEBIAN_TAG: &x86_test-gl "2020-01-30"
+    DEBIAN_TAG: &x86_test-gl "2020-02-14"
 
 # Debian 10 based x86 test image for VK
 x86_test-vk:
@@ -165,7 +165,7 @@ arm_build:
     - .debian@container-ifnot-exists@arm64v8
     - .container
   variables:
-    DEBIAN_TAG: &arm_build "2020-02-05"
+    DEBIAN_TAG: &arm_build "2020-02-24-4"
 
 .use-arm_build:
   variables:
@@ -332,6 +332,8 @@ meson-armhf:
   variables:
     CROSS: armhf
     LLVM_VERSION: "7"
+    EXTRA_OPTION: >
+      -D llvm=false
   script:
     - .gitlab-ci/meson-build.sh
     - .gitlab-ci/prepare-artifacts.sh
@@ -341,11 +343,22 @@ meson-arm64:
     - .meson-arm
     - .ci-deqp-artifacts
   variables:
-    VULKAN_DRIVERS: "freedreno,amd"
+    VULKAN_DRIVERS: "freedreno"
+    EXTRA_OPTION: >
+      -D llvm=false
   script:
     - .gitlab-ci/meson-build.sh
     - .gitlab-ci/prepare-artifacts.sh
 
+meson-arm64-build-test:
+  extends:
+    - .meson-arm
+    - .ci-deqp-artifacts
+  variables:
+    VULKAN_DRIVERS: "amd"
+  script:
+    - .gitlab-ci/meson-build.sh
+
 meson-clang:
   extends: .meson-build
   variables:
@@ -468,10 +481,11 @@ meson-i386:
 meson-s390x:
   extends:
     - .meson-cross
+  tags:
+    - gstreamer
   variables:
     CROSS: s390x
     GALLIUM_DRIVERS: "swrast"
-    LLVM_VERSION: "7"
   script:
     - dpkg -i /var/cache/apt/archives/$CROSS/*.deb
     - .gitlab-ci/meson-build.sh
@@ -482,7 +496,6 @@ meson-ppc64el:
   variables:
     CROSS: ppc64el
     GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl"
-    LLVM_VERSION: "8"
     VULKAN_DRIVERS: "amd"
 
 meson-mingw32-x86_64:
@@ -705,3 +718,20 @@ radv_polaris10_vkcts:
     DEQP_SKIPS: deqp-radv-polaris10-skips.txt
   tags:
     - polaris10
+
+.traces-test:
+  extends:
+    - .test-gl
+  cache:
+    key: ${CI_JOB_NAME}
+    paths:
+      - .git-lfs-storage/
+  script:
+    - ./artifacts/tracie-runner.sh
+
+llvmpipe-traces:
+  variables:
+    LIBGL_ALWAYS_SOFTWARE: "true"
+    GALLIUM_DRIVER: "llvmpipe"
+    DEVICE_NAME: "vmware-llvmpipe"
+  extends: .traces-test