X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=9e70ce88233058c4963d71ae006b53b0244f0455;hb=545988c6172e51ea00c87abe966d5ecd03b08e98;hp=9aea544a87bdf40debb09a83fdb9c960160fd449;hpb=520a77d486c843ea58e41a869df18627943afd1a;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9aea544a87b..9e70ce88233 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,23 +3,51 @@ variables: include: - project: 'wayland/ci-templates' - # Must be the same as in .gitlab-ci/lava-gitlab-ci.yml - ref: 0a9bdd33a98f05af6761ab118b5074952242aab0 + ref: b7030c2cd0d6ccc5f6d4f8299bafa4daa9240d71 file: '/templates/debian.yml' - -include: - local: '.gitlab-ci/lava-gitlab-ci.yml' stages: - container - build - test + - success # When to automatically run the CI .ci-run-policy: rules: - - when: on_success + # Run pipeline by default for merge requests changing files affecting it + - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' + changes: &paths + - VERSION + - bin/**/* + # GitLab CI + - .gitlab-ci.yml + - .gitlab-ci/**/* + # Meson + - meson* + - build-support/**/* + - subprojects/**/* + # SCons + - SConstruct + - scons/**/* + - common.py + # Source code + - include/**/* + - src/**/* + when: on_success + # Run pipeline by default in the main project if files affecting it were + # changed + - if: '$CI_PROJECT_PATH == "mesa/mesa"' + changes: + *paths + when: on_success + # Allow triggering jobs manually on branches of forked projects + - if: '$CI_PROJECT_PATH != "mesa/mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME' + when: manual + # Otherwise, most jobs won't run + - when: never retry: max: 2 when: @@ -27,6 +55,20 @@ stages: # Cancel CI run if a newer commit is pushed to the same branch interruptible: true +success: + stage: success + image: debian:stable-slim + only: + - merge_requests + except: + changes: + *paths + variables: + GIT_STRATEGY: none + script: + - echo "Dummy job to make sure every merge request pipeline runs at least one job" + + .ci-deqp-artifacts: artifacts: when: always @@ -36,7 +78,7 @@ stages: # https://gitlab.com/gitlab-org/gitlab-ce/commit/8788fb925706cad594adf6917a6c5f6587dd1521 - artifacts -# Build the "normal" (non-LAVA) CI docker images. +# Build the 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. @@ -57,32 +99,6 @@ stages: stage: container extends: - .ci-run-policy - rules: - # Run pipeline by default for merge requests changing files affecting it - - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' - changes: - - VERSION - - bin/**/* - # GitLab CI - - .gitlab-ci.yml - - .gitlab-ci/**/* - # Meson - - meson* - - build-support/**/* - - subprojects/**/* - # SCons - - SConstruct - - scons/**/* - - common.py - # Source code - - include/**/* - - src/**/* - when: on_success - # Always run pipeline by default in the main project - - if: '$CI_PROJECT_PATH == "mesa/mesa"' - when: on_success - # Otherwise, allow triggering jobs manually - - when: manual variables: DEBIAN_VERSION: buster-slim REPO_SUFFIX: $CI_JOB_NAME @@ -96,7 +112,7 @@ x86_build: - .debian@container-ifnot-exists - .container variables: - DEBIAN_TAG: &x86_build "2019-11-13" + DEBIAN_TAG: &x86_build "2020-02-15" .use-x86_build: variables: @@ -109,7 +125,25 @@ x86_build: x86_test-gl: extends: x86_build variables: - DEBIAN_TAG: &x86_test-gl "2019-12-05" + DEBIAN_TAG: &x86_test-gl "2020-01-30" + +# Debian 10 based x86 test image for VK +x86_test-vk: + extends: x86_build + variables: + DEBIAN_TAG: &x86_test-vk "2020-01-14" + # Can only be triggered manually on personal branches because RADV is the only + # driver that does Vulkan testing at the moment. + rules: + # Never build the test image for VK by default in the main project. + - if: '$CI_PROJECT_PATH == "mesa/mesa"' + when: never + # Never build the test image for VK by default for merge requests. + - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' + when: never + # Otherwise, allow building it manually for personal branches. + - when: manual + # Debian 9 based x86 build image (old LLVM) x86_build_old: @@ -131,7 +165,7 @@ arm_build: - .debian@container-ifnot-exists@arm64v8 - .container variables: - DEBIAN_TAG: &arm_build "2019-11-13" + DEBIAN_TAG: &arm_build "2020-02-05" .use-arm_build: variables: @@ -144,7 +178,7 @@ arm_build: arm_test: extends: arm_build variables: - DEBIAN_TAG: &arm_test "2019-11-22" + DEBIAN_TAG: &arm_test "2020-01-30" .use-arm_test: variables: @@ -197,6 +231,8 @@ arm_test: extends: - .build-linux - .use-x86_build + variables: + LLVM_VERSION: 9 script: - .gitlab-ci/meson-build.sh @@ -223,7 +259,7 @@ meson-testing: GALLIUM_ST: > -D dri3=true GALLIUM_DRIVERS: "swrast" - LLVM_VERSION: "7" + VULKAN_DRIVERS: amd BUILDTYPE: "debugoptimized" script: - .gitlab-ci/meson-build.sh @@ -250,7 +286,6 @@ meson-main: -D gallium-nine=true -D gallium-opencl=disabled 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 @@ -277,6 +312,7 @@ meson-main: -D gallium-va=false -D gallium-xa=false -D gallium-nine=false + LLVM_VERSION: "8" .meson-arm: extends: @@ -285,23 +321,26 @@ meson-main: 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 + BUILDTYPE: "debugoptimized" tags: - aarch64 meson-armhf: - extends: .meson-arm + extends: + - .meson-arm + - .ci-deqp-artifacts variables: CROSS: armhf LLVM_VERSION: "7" + script: + - .gitlab-ci/meson-build.sh + - .gitlab-ci/prepare-artifacts.sh meson-arm64: extends: - .meson-arm - .ci-deqp-artifacts variables: - BUILDTYPE: "debugoptimized" VULKAN_DRIVERS: "freedreno,amd" script: - .gitlab-ci/meson-build.sh @@ -316,8 +355,8 @@ meson-clang: DRI_DRIVERS: "auto" GALLIUM_DRIVERS: "auto" VULKAN_DRIVERS: intel,amd,freedreno - CC: "ccache clang-8" - CXX: "ccache clang++-8" + CC: "ccache clang-9" + CXX: "ccache clang++-9" .meson-windows: extends: @@ -407,7 +446,6 @@ meson-vulkan: -D cpp_args=-fno-sanitize-recover=all UBSAN_OPTIONS: "print_stacktrace=1" VULKAN_DRIVERS: intel,amd,freedreno - LLVM_VERSION: "8" EXTRA_OPTION: > -D vulkan-overlay-layer=true @@ -425,6 +463,27 @@ meson-i386: -D vulkan-overlay-layer=true -D llvm=false -D osmesa=classic + -D werror=true + +meson-s390x: + extends: + - .meson-cross + tags: + - gstreamer + variables: + CROSS: s390x + GALLIUM_DRIVERS: "swrast" + script: + - dpkg -i /var/cache/apt/archives/$CROSS/*.deb + - .gitlab-ci/meson-build.sh + +meson-ppc64el: + extends: + - meson-s390x + variables: + CROSS: ppc64el + GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl" + VULKAN_DRIVERS: "amd" meson-mingw32-x86_64: extends: .meson-build @@ -444,7 +503,7 @@ scons: SCONS_CHECK_COMMAND: "scons llvm=1 force_scons=1 check" script: - SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check force_scons=1" .gitlab-ci/scons-build.sh - - LLVM_VERSION=8 .gitlab-ci/scons-build.sh + - LLVM_VERSION=9 .gitlab-ci/scons-build.sh scons-old-llvm: extends: @@ -453,14 +512,12 @@ scons-old-llvm: script: - LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh -.test-gl: +.test: extends: - .ci-run-policy stage: test variables: GIT_STRATEGY: none # testing doesn't build anything from source - TAG: *x86_test-gl - image: "$CI_REGISTRY_IMAGE/debian/x86_test-gl:$TAG" before_script: # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY - rm -rf install @@ -473,10 +530,27 @@ scons-old-llvm: - results/ dependencies: - meson-testing + +.test-gl: + extends: + - .test + variables: + TAG: *x86_test-gl + image: "$CI_REGISTRY_IMAGE/debian/x86_test-gl:$TAG" needs: - meson-testing - x86_test-gl +.test-vk: + extends: + - .test + variables: + TAG: *x86_test-vk + image: "$CI_REGISTRY_IMAGE/debian/x86_test-vk:$TAG" + needs: + - meson-testing + - x86_test-vk + .piglit-test: extends: .test-gl artifacts: @@ -494,11 +568,13 @@ piglit-quick_gl: extends: .piglit-test variables: LP_NUM_THREADS: 0 + NIR_VALIDATE: 0 PIGLIT_OPTIONS: > --process-isolation false -x arb_gpu_shader5 -x egl_ext_device_ -x egl_ext_platform_device + -x ext_timer_query@time-elapsed -x glx-multithread-clearbuffer -x glx-multithread-shader-compile -x max-texture-size @@ -509,32 +585,39 @@ piglit-glslparser: extends: .piglit-test variables: LP_NUM_THREADS: 0 + NIR_VALIDATE: 0 PIGLIT_PROFILES: glslparser piglit-quick_shader: extends: .piglit-test variables: LP_NUM_THREADS: 1 - PIGLIT_OPTIONS: > - -x spec@arb_arrays_of_arrays@execution@ubo - -x spec@arb_gpu_shader_int64@execution$$ - -x spec@arb_separate_shader_objects@execution - -x spec@arb_separate_shader_objects@linker - -x spec@arb_shader_storage_buffer_object@execution - -x spec@glsl-1.50@execution@built-in-functions + NIR_VALIDATE: 0 PIGLIT_PROFILES: quick_shader -.deqp-test-gl: - extends: .test-gl +.deqp-test: variables: DEQP_SKIPS: deqp-default-skips.txt script: - ./artifacts/deqp-runner.sh +.deqp-test-gl: + extends: + - .test-gl + - .deqp-test + +.deqp-test-vk: + extends: + - .test-vk + - .deqp-test + variables: + DEQP_VER: vk + test-llvmpipe-gles2: variables: DEQP_VER: gles2 DEQP_PARALLEL: 4 + NIR_VALIDATE: 0 # Don't use threads inside llvmpipe, we've already got all 4 cores # busy with DEQP_PARALLEL. LP_NUM_THREADS: 0 @@ -594,3 +677,31 @@ arm64_a306_gles2: DEQP_SKIPS: deqp-default-skips.txt tags: - db410c + +# RADV CI +.test-radv: + variables: + VK_DRIVER: radeon + RADV_DEBUG: checkir + # Can only be triggered manually on personal branches because RADV is the only + # driver that does Vulkan testing at the moment. + rules: + # Never test RADV by default in the main project. + - if: '$CI_PROJECT_PATH == "mesa/mesa"' + when: never + # Never test RADV by default for merge requests. + - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' + when: never + # Otherwise, allow testing RADV if the test image for VK has been manually + # started. + - when: on_success + +radv_polaris10_vkcts: + extends: + - .deqp-test-vk + - .test-radv + variables: + DEQP_PARALLEL: 4 + DEQP_SKIPS: deqp-radv-polaris10-skips.txt + tags: + - polaris10