X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=b595f75e019107726b7f400f7684a82988d45870;hb=e8f0483ec408037ce7b7c6014674f13cc4461079;hp=5cd8a31804cea1183bce67689c7e83b5848e54c8;hpb=f5235a5b73116ee285bb7f3d50bb5ad4e1269a11;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5cd8a31804c..b595f75e019 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -120,7 +120,7 @@ x86_build:
     - .debian@container-ifnot-exists
     - .container
   variables:
-    DEBIAN_TAG: &x86_build "2020-02-15"
+    DEBIAN_TAG: &x86_build "2020-03-11"
 
 .use-x86_build:
   variables:
@@ -161,7 +161,7 @@ arm_build:
     - .debian@container-ifnot-exists@arm64v8
     - .container
   variables:
-    DEBIAN_TAG: &arm_build "2020-02-26"
+    DEBIAN_TAG: &arm_build "2020-03-09"
 
 .use-arm_build:
   variables:
@@ -472,24 +472,27 @@ meson-i386:
   extends: .meson-cross
   variables:
     CROSS: i386
-    VULKAN_DRIVERS: intel
+    VULKAN_DRIVERS: intel,amd
     DRI_DRIVERS: "swrast"
     GALLIUM_DRIVERS: "iris"
     EXTRA_OPTION: >
       -D vulkan-overlay-layer=true
-      -D llvm=false
       -D osmesa=classic
       -D werror=true
+  script:
+    - dpkg -i /var/cache/apt/archives/$CROSS/*.deb
+    - .gitlab-ci/meson-build.sh
 
 meson-s390x:
   extends:
     - .meson-cross
-  tags:
-    - gstreamer
   variables:
     CROSS: s390x
     GALLIUM_DRIVERS: "swrast"
   script:
+    # For unknown reasons "too many" installed i386 libraries cause qemu to
+    # crash while executing llvm-config for s390x.
+    - apt-get remove -y libglib2.0-0:i386
     - dpkg -i /var/cache/apt/archives/$CROSS/*.deb
     - .gitlab-ci/meson-build.sh
 
@@ -698,13 +701,39 @@ arm64_a630_gles3:
   variables:
     DEQP_VER: gles3
 
+.baremetal-test:
+  extends:
+    - .ci-run-policy
+  stage: test
+
 arm64_a306_gles2:
-  extends: arm64_a630_gles2
+  extends:
+    - .baremetal-test
+    - .use-arm_build
+  stage: freedreno
   variables:
+    BM_KERNEL: /lava-files/Image
+    BM_DTB: /lava-files/apq8016-sbc.dtb
+    BM_ROOTFS: /lava-files/rootfs-arm64
+    BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8"
     DEQP_EXPECTED_FAILS: deqp-freedreno-a307-fails.txt
-    DEQP_SKIPS: deqp-default-skips.txt
+    DEQP_SKIPS: deqp-freedreno-a307-skips.txt
+    DEQP_VER: gles2
+    DEQP_PARALLEL: 4
+  script:
+    - .gitlab-ci/bare-metal/fastboot.sh
+  needs:
+    - meson-arm64
   tags:
-    - db410c
+    - google-freedreno-db410c
+
+# Disabled due to flaky results
+.arm64_a306_gles3:
+  extends:
+    - arm64_a306_gles2
+  parallel: 8
+  variables:
+    DEQP_VER: gles3
 
 # RADV CI
 .test-radv: