virgl: support emulating planar image sampling

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbc38ff156d22ff740e64f32e1f7a0d8bb645d05..2882e449ff70c51872591faa8d8a77a40026ae69 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,12 +15,14 @@
 variables:
   UPSTREAM_REPO: mesa/mesa
   DEBIAN_TAG: "2019-10-30"
-  DEBIAN_ARM64_TAG: "arm64v8-2019-10-23"
+  DEBIAN_ARM64_TAG: "arm64v8-2019-11-06"
+  DEBIAN_ARM64_TEST_TAG: "arm64v8-test-2019-11-06"
   STRETCH_TAG: "2019-09-18"
   DEBIAN_VERSION: buster-slim
   STRETCH_VERSION: stretch-slim
   DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
   DEBIAN_ARM64_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_ARM64_TAG"
+  DEBIAN_ARM64_TEST_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_ARM64_TEST_TAG"
   STRETCH_IMAGE: "$CI_REGISTRY_IMAGE/debian/$STRETCH_VERSION:$STRETCH_TAG"
 
 include:
@@ -118,6 +120,14 @@ debian-10:arm64:
     DEBIAN_TAG: "$DEBIAN_ARM64_TAG"
     DEBIAN_EXEC: 'bash .gitlab-ci/debian-arm64-install.sh'
 
+debian-10-test:arm64:
+  extends:
+    - .debian@container-ifnot-exists@arm64v8
+    - .container
+  variables:
+    DEBIAN_TAG: "$DEBIAN_ARM64_TEST_TAG"
+    DEBIAN_EXEC: 'bash .gitlab-ci/debian-arm64-test-install.sh'
+
 
 # BUILD
 
@@ -136,29 +146,19 @@ debian-10:arm64:
 # Just Linux
 .build-linux:
   extends: .build-common
-  tags:
-    - mesa-autoscale
   cache:
     key: ${CI_JOB_NAME}
     paths:
       - ccache
   variables:
     CCACHE_COMPILERCHECK: "content"
-    NINJA_FLAGS: "-j8" # autoscale is provisioned at 4 CPUs/job.
-    # kubernetes (the mesa-autoscale runner) always has a clean working
-    # dir, so we can't reuse the git clone, but that also means we don't
-    # need to download any extra history (normally extra history is
-    # needed so that a future fetch can find a shared parent).
-    GIT_DEPTH: 1
-    # Autoscale runners have 300GB of disk (since iops/throughput
-    # scales with disk size!), but we want to leave lots of space for
-    # container caching.
-    CCACHE_SIZE: 20G
   # Use ccache transparently, and print stats before/after
   before_script:
     - export PATH="/usr/lib/ccache:$PATH"
     - export CCACHE_BASEDIR="$PWD"
-    - ccache --max-size="$CCACHE_SIZE" || true
+    - export CCACHE_DIR="$PWD/ccache"
+    - ccache --max-size=1500M
+    - ccache --zero-stats || true
     - ccache --show-stats || true
   after_script:
     # In case the install dir is being saved as artifacts, tar it up
@@ -167,6 +167,7 @@ debian-10:arm64:
     - if [ -d install ]; then
         tar -cf artifacts/install.tar install;
       fi
+    - export CCACHE_DIR="$PWD/ccache"
     - ccache --show-stats
 
 .build-windows:
@@ -190,7 +191,7 @@ debian-10:arm64:
     - .build-linux
     - .use-debian-10:amd64
   variables:
-    SCONSFLAGS: "-j8"
+    SCONSFLAGS: "-j4"
   script:
     - .gitlab-ci/scons-build.sh
 
@@ -252,9 +253,6 @@ meson-main:
     GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,swrast,tegra,v3d,vc4"
     EXTRA_OPTION: >
       -D I-love-half-baked-turnips=true
-    NINJA_FLAGS: "-j4"
-    CCACHE_DIR: "$PWD/ccache"
-    CCACHE_SIZE: "1500M"
   needs:
     - debian-10:arm64
   tags:
@@ -462,6 +460,7 @@ scons-old-llvm:
     # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
     - rm -rf install
     - tar -xf artifacts/install.tar
+    - LD_LIBRARY_PATH=install/lib ldd install/lib/{*,dri/swrast_dri}.so
     - ./artifacts/deqp-runner.sh
   artifacts:
     when: on_failure
@@ -506,7 +505,7 @@ test-softpipe-gles3-limited:
 
 arm64_a630_gles2:
   extends: .deqp-test
-  image: $DEBIAN_ARM64_IMAGE
+  image: $DEBIAN_ARM64_TEST_IMAGE
   variables:
     DEQP_VER: gles2
     DEQP_RENDERER_MATCH: "FD630"
@@ -519,7 +518,7 @@ arm64_a630_gles2:
     - meson-arm64
   needs:
     - meson-arm64
-    - debian-10:arm64
+    - debian-10-test:arm64
 
 arm64_a630_gles31:
   extends: arm64_a630_gles2