# repository's registry will be used there as well.
variables:
UPSTREAM_REPO: mesa/mesa
- DEBIAN_TAG: "2019-07-23"
+ DEBIAN_TAG: "2019-08-09"
DEBIAN_VERSION: stretch-slim
DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
stages:
- containers-build
- build+test
+ - test
# When to automatically run the CI
when:
- runner_system_failure
+.ci-deqp-artifacts: &ci-deqp-artifacts
+ artifacts:
+ when: always
+ untracked: false
+ paths:
+ # Watch out! Artifacts are relative to the build dir.
+ # https://gitlab.com/gitlab-org/gitlab-ce/commit/8788fb925706cad594adf6917a6c5f6587dd1521
+ - artifacts
# CONTAINERS
- ccache --zero-stats || true
- ccache --show-stats || true
after_script:
+ # In case the install dir is being saved as artifacts, tar it up
+ # so that symlinks and hardlinks aren't each packed separately in
+ # the zip file.
+ - if [ -d install ]; then
+ tar -cf artifacts/install.tar install;
+ fi
- export CCACHE_DIR="$PWD/ccache"
- ccache --show-stats
# gallium drivers combined.
# Start this early so that it doesn't limit the total run time.
#
-# We also put softpipe (and therefore gallium nine, which requires
-# it) here, since softpipe/llvmpipe can't be built alongside classic
-# swrast.
-#
-# Putting glvnd here is arbitrary, but we want it in one of the builds
-# for coverage.
+# We also stick the glvnd build here, since we want non-glvnd in
+# meson-main for actual driver CI.
meson-swr-glvnd:
extends: .meson-build
variables:
-D gallium-omx=disabled
-D gallium-va=false
-D gallium-xa=false
- -D gallium-nine=true
+ -D gallium-nine=false
-D gallium-opencl=disabled
- -D osmesa=gallium
- GALLIUM_DRIVERS: "swr,swrast,iris"
+ GALLIUM_DRIVERS: "swr,iris"
LLVM_VERSION: "6.0"
meson-clang:
-D gbm=true
-D egl=true
-D platforms=x11,wayland,drm,surfaceless
- -D osmesa=classic
- DRI_DRIVERS: "i915,i965,r100,r200,swrast,nouveau"
+ DRI_DRIVERS: "i915,i965,r100,r200,nouveau"
GALLIUM_ST: >
-D dri3=true
- -D tools=drm-shim
-D gallium-extra-hud=true
-D gallium-vdpau=true
-D gallium-xvmc=true
-D gallium-omx=bellagio
-D gallium-va=true
-D gallium-xa=true
- -D gallium-nine=false
+ -D gallium-nine=true
-D gallium-opencl=disabled
- GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,svga,v3d,vc4,virgl,etnaviv,panfrost,lima"
+ GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima"
LLVM_VERSION: "7"
EXTRA_OPTION: >
+ -D osmesa=gallium
-D tools=all
MESON_SHADERDB: "true"
+ BUILDTYPE: "debugoptimized"
+ <<: *ci-deqp-artifacts
meson-clover:
extends: .meson-build
-D gallium-xa=false
-D gallium-nine=false
-D llvm=false
- CROSS: >
- --cross /tmp/cross_file.txt
-
+ <<: *ci-deqp-artifacts
script:
- - /usr/share/meson/debcrossgen --arch ${ARCH} -o /tmp/cross_file.txt
- # Work around a bug in debcrossgen that should be fixed in the next release
- - sed -i "s|cpu_family = 'i686'|cpu_family = 'x86'|g" /tmp/cross_file.txt
- .gitlab-ci/meson-build.sh
meson-armhf:
extends: .meson-cross
variables:
- ARCH: armhf
+ CROSS: armhf
VULKAN_DRIVERS: freedreno
GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,tegra,v3d,vc4"
# Disable the tests since we're cross compiling.
meson-arm64:
extends: .meson-cross
variables:
- ARCH: arm64
+ CROSS: arm64
VULKAN_DRIVERS: freedreno
GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,tegra,v3d,vc4"
# Disable the tests since we're cross compiling.
-D I-love-half-baked-turnips=true
-D vulkan-overlay-layer=true
+# While the main point of this build is testing the i386 cross build,
+# we also use this one to test some other options that are exclusive
+# with meson-main's choices (classic swrast and osmesa)
meson-i386:
extends: .meson-cross
variables:
- ARCH: i386
+ CROSS: i386
VULKAN_DRIVERS: intel
- GALLIUM_DRIVERS: "swrast"
+ DRI_DRIVERS: "swrast"
+ GALLIUM_DRIVERS: "iris"
# Disable i386 tests, because u_format_tests gets precision
# failures in dxtn unpacking
EXTRA_OPTION: >
-D build-tests=false
-D vulkan-overlay-layer=true
+ -D llvm=false
+ -D osmesa=classic
scons-nollvm:
extends: .scons-build
LLVM_VERSION: "3.4"
# LLVM 3.4 packages were built with an old libstdc++ ABI
CXX: "g++ -D_GLIBCXX_USE_CXX11_ABI=0"
+
+.deqp-test:
+ <<: *ci-run-policy
+ stage: test
+ image: $DEBIAN_IMAGE
+ variables:
+ GIT_STRATEGY: none # testing doesn't build anything from source
+ DEQP_SKIPS: deqp-default-skips.txt
+ script:
+ # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
+ - rm -rf install
+ - tar -xf artifacts/install.tar
+ - ./artifacts/deqp-runner.sh
+ artifacts:
+ when: on_failure
+ name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
+ paths:
+ - results/
+
+test-llvmpipe-gles2:
+ parallel: 4
+ variables:
+ DEQP_VER: gles2
+ DEQP_EXPECTED_FAILS: deqp-llvmpipe-fails.txt
+ LIBGL_ALWAYS_SOFTWARE: "true"
+ DEQP_RENDERER_MATCH: "llvmpipe"
+ extends: .deqp-test
+ dependencies:
+ - meson-main
+
+test-softpipe-gles2:
+ parallel: 4
+ variables:
+ DEQP_VER: gles2
+ DEQP_EXPECTED_FAILS: deqp-softpipe-fails.txt
+ LIBGL_ALWAYS_SOFTWARE: "true"
+ DEQP_RENDERER_MATCH: "softpipe"
+ GALLIUM_DRIVER: "softpipe"
+ extends: .deqp-test
+ dependencies:
+ - meson-main
+
+# The GLES2 CTS run takes about 8 minutes of CPU time, while GLES3 is
+# 25 minutes. Until we can get its runtime down, just do a partial
+# (every 10 tests) run.
+test-softpipe-gles3-limited:
+ variables:
+ DEQP_VER: gles3
+ DEQP_EXPECTED_FAILS: deqp-softpipe-fails.txt
+ LIBGL_ALWAYS_SOFTWARE: "true"
+ DEQP_RENDERER_MATCH: "softpipe"
+ GALLIUM_DRIVER: "softpipe"
+ CI_NODE_INDEX: 1
+ CI_NODE_TOTAL: 10
+ extends: .deqp-test
+ dependencies:
+ - meson-main
projects / mesa.git / blobdiff