X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=80b4b012c464288b884b144cd5b3b71a37869b60;hb=ff71fae4403269c6ecd99cf15fa03a7a54355626;hp=895017a6873727a1dd3d1e37f80a210a12cd7a82;hpb=ac78ca4b39ce6e927f824b928d17f30c1d9273ce;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 895017a6873..80b4b012c46 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,35 +1,10 @@ -# This is the tag of the docker image used for the build jobs. If the -# image doesn't exist yet, the containers stage generates it. -# -# In order to generate a new image, one should generally change the tag. -# While removing the image from the registry would also work, that's not -# recommended except for ephemeral images during development: Replacing -# an image after a significant amount of time might pull in newer -# versions of gcc/clang or other packages, which might break the build -# with older commits using the same tag. -# -# After merging a change resulting in generating a new image to the -# main repository, it's recommended to remove the image from the source -# repository's container registry, so that the image from the main -# repository's registry will be used there as well. variables: UPSTREAM_REPO: mesa/mesa - DEBIAN_TAG: "amd64-2019-11-13-2" - DEBIAN_TEST_TAG: "amd64-test-2019-11-12-2" - DEBIAN_ARM64_TAG: "arm64v8-2019-11-13" - DEBIAN_ARM64_TEST_TAG: "arm64v8-test-2019-11-12-2" - STRETCH_TAG: "2019-09-18" - DEBIAN_VERSION: buster-slim - STRETCH_VERSION: stretch-slim - DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG" - DEBIAN_TEST_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TEST_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: - project: 'wayland/ci-templates' - ref: 1f7f57c64ff4ebbf7292e3b7a13600518b8cb24c + # Must be the same as in .gitlab-ci/lava-gitlab-ci.yml + ref: f69acac60d5dde0410124fd5674764600821b7a6 file: '/templates/debian.yml' include: @@ -81,62 +56,97 @@ stages: # https://gitlab.com/gitlab-org/gitlab-ce/commit/8788fb925706cad594adf6917a6c5f6587dd1521 - artifacts -# Build the normal CI native and cross-build docker images. +# Build the "normal" (non-LAVA) CI docker images. +# +# DEBIAN_TAG is the tag of the docker image used by later stage jobs. If the +# image doesn't exist yet, the container stage job generates it. +# +# In order to generate a new image, one should generally change the tag. +# While removing the image from the registry would also work, that's not +# recommended except for ephemeral images during development: Replacing +# an image after a significant amount of time might pull in newer +# versions of gcc/clang or other packages, which might break the build +# with older commits using the same tag. +# +# After merging a change resulting in generating a new image to the +# main repository, it's recommended to remove the image from the source +# repository's container registry, so that the image from the main +# repository's registry will be used there as well. .container: stage: container extends: - .ci-run-policy variables: + DEBIAN_VERSION: buster-slim + REPO_SUFFIX: $CI_JOB_NAME + DEBIAN_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh' # no need to pull the whole repo to build the container image GIT_STRATEGY: none -debian-10:amd64: +# Debian 10 based x86 build image +x86_build: extends: - .debian@container-ifnot-exists - .container variables: - DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh' + DEBIAN_TAG: &x86_build "2019-11-13" -.use-debian-10:amd64: - image: $DEBIAN_IMAGE +.use-x86_build: + variables: + TAG: *x86_build + image: "$CI_REGISTRY_IMAGE/debian/x86_build:$TAG" needs: - - debian-10:amd64 + - x86_build -debian-10-test:amd64: - extends: debian-10:amd64 +# Debian 10 based x86 test image +x86_test: + extends: x86_build variables: - DEBIAN_TAG: "$DEBIAN_TEST_TAG" - DEBIAN_EXEC: 'bash .gitlab-ci/debian-test-install.sh' + DEBIAN_TAG: &x86_test "2019-11-20-2" -debian-9:amd64: - extends: debian-10:amd64 +# Debian 9 based x86 build image (old LLVM) +x86_build_old: + extends: x86_build variables: - DEBIAN_TAG: $STRETCH_TAG - DEBIAN_VERSION: $STRETCH_VERSION - DEBIAN_IMAGE: $STRETCH_IMAGE - DEBIAN_EXEC: 'bash .gitlab-ci/debian-stretch-install.sh' + DEBIAN_TAG: &x86_build_old "2019-09-18" + DEBIAN_VERSION: stretch-slim -.use-debian-9:amd64: - image: $STRETCH_IMAGE +.use-x86_build_old: + variables: + TAG: *x86_build_old + image: "$CI_REGISTRY_IMAGE/debian/x86_build_old:$TAG" needs: - - debian-9:amd64 + - x86_build_old -debian-10:arm64: +# Debian 10 based ARM build image +arm_build: extends: - .debian@container-ifnot-exists@arm64v8 - .container variables: - DEBIAN_TAG: "$DEBIAN_ARM64_TAG" - DEBIAN_EXEC: 'bash .gitlab-ci/debian-arm64-install.sh' + DEBIAN_TAG: &arm_build "2019-11-13" -debian-10-test:arm64: - extends: - - .debian@container-ifnot-exists@arm64v8 - - .container +.use-arm_build: + variables: + TAG: *arm_build + image: "$CI_REGISTRY_IMAGE/debian/arm_build:$TAG" + needs: + - arm_build + +# Debian 10 based ARM test image +arm_test: + extends: arm_build + variables: + DEBIAN_TAG: &arm_test "2019-11-12" + +.use-arm_test: variables: - DEBIAN_TAG: "$DEBIAN_ARM64_TEST_TAG" - DEBIAN_EXEC: 'bash .gitlab-ci/debian-arm64-test-install.sh' + TAG: *arm_test + image: "$CI_REGISTRY_IMAGE/debian/arm_test:$TAG" + needs: + - meson-arm64 + - arm_test # BUILD @@ -156,22 +166,16 @@ debian-10-test:arm64: # Just Linux .build-linux: extends: .build-common - cache: - key: ${CI_JOB_NAME} - paths: - - ccache variables: CCACHE_COMPILERCHECK: "content" + CCACHE_COMPRESS: "true" + CCACHE_DIR: /cache/mesa/ccache # Use ccache transparently, and print stats before/after before_script: - export PATH="/usr/lib/ccache:$PATH" - export CCACHE_BASEDIR="$PWD" - - export CCACHE_DIR="$PWD/ccache" - - ccache --max-size=1500M - - ccache --zero-stats || true - - ccache --show-stats || true + - ccache --show-stats after_script: - - export CCACHE_DIR="$PWD/ccache" - ccache --show-stats .build-windows: @@ -186,23 +190,41 @@ debian-10-test:arm64: .meson-build: extends: - .build-linux - - .use-debian-10:amd64 + - .use-x86_build script: - .gitlab-ci/meson-build.sh .scons-build: extends: - .build-linux - - .use-debian-10:amd64 + - .use-x86_build variables: SCONSFLAGS: "-j4" script: - .gitlab-ci/scons-build.sh -meson-main: +meson-testing: extends: - .meson-build - .ci-deqp-artifacts + variables: + UNWIND: "true" + DRI_LOADERS: > + -D glx=dri + -D gbm=true + -D egl=true + -D platforms=x11,drm,surfaceless + GALLIUM_ST: > + -D dri3=true + GALLIUM_DRIVERS: "swrast" + LLVM_VERSION: "7" + BUILDTYPE: "debugoptimized" + script: + - .gitlab-ci/meson-build.sh + - .gitlab-ci/prepare-artifacts.sh + +meson-main: + extends: .meson-build variables: UNWIND: "true" DRI_LOADERS: > @@ -221,16 +243,14 @@ meson-main: -D gallium-xa=true -D gallium-nine=true -D gallium-opencl=disabled - GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink" + GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swr,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink" LLVM_VERSION: "7" EXTRA_OPTION: > -D osmesa=gallium -D tools=all - BUILDTYPE: "debugoptimized" script: - .gitlab-ci/meson-build.sh - .gitlab-ci/run-shader-db.sh - - .gitlab-ci/prepare-artifacts.sh .meson-cross: extends: @@ -253,15 +273,14 @@ meson-main: -D gallium-nine=false .meson-arm: - extends: .meson-cross - image: $DEBIAN_ARM64_IMAGE + extends: + - .meson-cross + - .use-arm_build variables: VULKAN_DRIVERS: freedreno GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,swrast,tegra,v3d,vc4" EXTRA_OPTION: > -D I-love-half-baked-turnips=true - needs: - - debian-10:arm64 tags: - aarch64 @@ -282,35 +301,12 @@ meson-arm64: - .gitlab-ci/meson-build.sh - .gitlab-ci/prepare-artifacts.sh -# NOTE: Building SWR is 2x (yes two) times slower than all the other -# gallium drivers combined. -# Start this early so that it doesn't limit the total run time. -# -# We also stick the glvnd build here, since we want non-glvnd in -# meson-main for actual driver CI. -meson-swr-glvnd: +meson-clang: extends: .meson-build variables: UNWIND: "true" DRI_LOADERS: > -D glvnd=true - -D egl=true - GALLIUM_ST: > - -D dri3=true - -D gallium-vdpau=false - -D gallium-xvmc=false - -D gallium-omx=disabled - -D gallium-va=false - -D gallium-xa=false - -D gallium-nine=false - -D gallium-opencl=disabled - GALLIUM_DRIVERS: "swr,iris" - LLVM_VERSION: "6.0" - -meson-clang: - extends: .meson-build - variables: - UNWIND: "true" DRI_DRIVERS: "auto" GALLIUM_DRIVERS: "auto" VULKAN_DRIVERS: intel,amd,freedreno @@ -367,7 +363,7 @@ meson-clover: meson-clover-old-llvm: extends: - meson-clover - - .use-debian-9:amd64 + - .use-x86_build_old variables: UNWIND: "false" DRI_LOADERS: > @@ -449,7 +445,7 @@ scons: scons-old-llvm: extends: - scons - - .use-debian-9:amd64 + - .use-x86_build_old script: - LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh - LLVM_VERSION=4.0 .gitlab-ci/scons-build.sh @@ -458,25 +454,26 @@ scons-old-llvm: .test: extends: - .ci-run-policy - image: $DEBIAN_TEST_IMAGE stage: test variables: GIT_STRATEGY: none # testing doesn't build anything from source + TAG: *x86_test + image: "$CI_REGISTRY_IMAGE/debian/x86_test:$TAG" before_script: # 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 + - LD_LIBRARY_PATH=install/lib find install/lib -name "*.so" -print -exec ldd {} \; artifacts: when: on_failure name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" paths: - results/ dependencies: - - meson-main + - meson-testing needs: - - meson-main - - debian-10-test:amd64 + - meson-testing + - x86_test .piglit-test: extends: .test @@ -553,35 +550,31 @@ test-softpipe-gles31: extends: test-softpipe-gles2 arm64_a630_gles2: - extends: .deqp-test - image: $DEBIAN_ARM64_TEST_IMAGE + extends: + - .deqp-test + - .use-arm_test variables: DEQP_VER: gles2 DEQP_EXPECTED_FAILS: deqp-freedreno-a630-fails.txt DEQP_SKIPS: deqp-freedreno-a630-skips.txt NIR_VALIDATE: 0 + DEQP_PARALLEL: 4 tags: - mesa-cheza dependencies: - meson-arm64 - needs: - - meson-arm64 - - debian-10-test:arm64 arm64_a630_gles31: extends: arm64_a630_gles2 - parallel: 4 variables: DEQP_VER: gles31 arm64_a630_gles3: - parallel: 6 extends: arm64_a630_gles2 variables: DEQP_VER: gles3 arm64_a306_gles2: - parallel: 4 extends: arm64_a630_gles2 variables: DEQP_EXPECTED_FAILS: deqp-freedreno-a307-fails.txt