X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=c2b73bca92709c9e7a613069032c36984134adf1;hb=5dbebf49822ff3fb3bc3e6123bac30214c432b77;hp=db5fcc6f924b06af639a62a05b6bf48afa9be871;hpb=af7dca35602be1eda7481176cec596181c8fec41;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db5fcc6f924..c2b73bca927 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ variables: include: - project: 'freedesktop/ci-templates' - ref: a1699326519fd28526485ce93464e33423bac564 + ref: 4b2997287317808830e9cb4eb0f99b691787da88 file: '/templates/debian.yml' - local: '.gitlab-ci/lava-gitlab-ci.yml' - local: '.gitlab-ci/test-source-dep.yml' @@ -17,16 +17,17 @@ stages: - softpipe - freedreno - panfrost - - misc-tests + - radv + - lima - success # When to automatically run the CI .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: &paths + # If any files affecting the pipeline are changed, build/test jobs run + # automatically once all dependency jobs have passed + - changes: &all_paths - VERSION - bin/**/* # GitLab CI @@ -44,16 +45,7 @@ stages: - 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 + # Otherwise, build/test jobs won't run - when: never retry: max: 2 @@ -69,7 +61,7 @@ success: - merge_requests except: changes: - *paths + *all_paths variables: GIT_STRATEGY: none script: @@ -107,9 +99,29 @@ success: stage: container extends: - .ci-run-policy + rules: + # Run pipeline by default if it was triggered by Marge Bot, is for a + # merge request, and any files affecting it were changed + - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' + changes: + *all_paths + when: on_success + # Run pipeline by default in the main project if any files affecting it were + # changed + - if: '$CI_PROJECT_PATH == "mesa/mesa"' + changes: + *all_paths + when: on_success + # Allow triggering jobs manually for MRs or branches of forked projects if + # any files affecting the pipeline were changed + - changes: + *all_paths + when: manual + # Otherwise, container jobs won't run + - when: never variables: FDO_DISTRIBUTION_VERSION: buster-slim - FDO_REPO_SUFFIX: $CI_JOB_NAME + FDO_REPO_SUFFIX: "debian/$CI_JOB_NAME" FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh' # no need to pull the whole repo to build the container image GIT_STRATEGY: none @@ -117,10 +129,10 @@ success: # Debian 10 based x86 build image x86_build: extends: - - .fdo.container-ifnot-exists@debian + - .fdo.container-build@debian - .container variables: - FDO_DISTRIBUTION_TAG: &x86_build "2020-03-13" + FDO_DISTRIBUTION_TAG: &x86_build "2020-03-18-jflags" .use-x86_build: variables: @@ -133,19 +145,19 @@ x86_build: x86_test-gl: extends: x86_build variables: - FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-03-13" + FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-03-18-jflags" # Debian 10 based x86 test image for VK x86_test-vk: extends: x86_build variables: - FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-03-16" + FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-04-09" # Debian 9 based x86 build image (old LLVM) x86_build_old: extends: x86_build variables: - FDO_DISTRIBUTION_TAG: &x86_build_old "2019-09-18" + FDO_DISTRIBUTION_TAG: &x86_build_old "2019-03-18-jflags" FDO_DISTRIBUTION_VERSION: stretch-slim .use-x86_build_old: @@ -158,10 +170,10 @@ x86_build_old: # Debian 10 based ARM build image arm_build: extends: - - .fdo.container-ifnot-exists@debian@arm64v8 + - .fdo.container-build@debian@arm64v8 - .container variables: - FDO_DISTRIBUTION_TAG: &arm_build "2020-03-13" + FDO_DISTRIBUTION_TAG: &arm_build "2020-04-01-jflags" .use-arm_build: variables: @@ -174,7 +186,7 @@ arm_build: arm_test: extends: arm_build variables: - FDO_DISTRIBUTION_TAG: &arm_test "2020-01-30" + FDO_DISTRIBUTION_TAG: &arm_test "2020-03-18-jflags" .use-arm_test: variables: @@ -184,6 +196,44 @@ arm_test: - meson-arm64 - arm_test +# Native Windows docker builds +# +# Unlike the above Linux-based builds - including MinGW/SCons builds which +# cross-compile for Windows - which use the freedesktop ci-templates, we +# cannot use the same scheme here. As Windows lacks support for +# Docker-in-Docker, and Podman does not run natively on Windows, we have +# to open-code much of the same ourselves. +# +# This is achieved by first running in a native Windows shell instance +# (host PowerShell) in the container stage to build and push the image, +# then in the build stage by executing inside Docker. + +.windows-docker-vs2019: + variables: + WINDOWS_TAG: "2020-03-24" + WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/windows/x64_build:$WINDOWS_TAG" + WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows/x64_build:$WINDOWS_TAG" + +windows_build_vs2019: + extends: + - .container + - .windows-docker-vs2019 + stage: container + variables: + GIT_STRATEGY: fetch # we do actually need the full repository though + tags: + - windows + - shell + - "1809" + - mesa + script: + - .\.gitlab-ci\windows\mesa_container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $WINDOWS_IMAGE $WINDOWS_UPSTREAM_IMAGE + +.use-windows_build_vs2019: + extends: .windows-docker-vs2019 + image: "$WINDOWS_IMAGE" + needs: + - windows_build_vs2019 # BUILD @@ -217,7 +267,10 @@ arm_test: .build-windows: extends: .build-common tags: - - mesa-windows + - windows + - docker + - "1809" + - mesa cache: key: ${CI_JOB_NAME} paths: @@ -385,21 +438,20 @@ meson-clang: CC: "ccache clang-9" CXX: "ccache clang++-9" -.meson-windows: +meson-windows-vs2019: extends: - .build-windows + - .use-windows_build_vs2019 stage: meson-misc - before_script: - - $ENV:ARCH = "x86" - - $ENV:VERSION = "2019\Community" script: - - cmd /C .gitlab-ci\meson-build.bat + - . .\.gitlab-ci\windows\mesa_build.ps1 scons-win64: extends: .scons-build variables: - SCONS_TARGET: platform=windows machine=x86_64 + SCONS_TARGET: platform=windows machine=x86_64 debug=1 SCONS_CHECK_COMMAND: "true" + allow_failure: true meson-clover: extends: .meson-build @@ -487,6 +539,8 @@ meson-i386: meson-s390x: extends: - .meson-cross + tags: + - kvm variables: CROSS: s390x GALLIUM_DRIVERS: "swrast" @@ -517,22 +571,6 @@ meson-mingw32-x86_64: -Dosmesa=gallium --cross-file=.gitlab-ci/x86_64-w64-mingw32 -scons: - extends: .scons-build - variables: - SCONS_TARGET: "llvm=1 swr=1" - SCONS_CHECK_COMMAND: "scons force_scons=1 ${SCONS_TARGET} check" - script: - - SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check force_scons=1" .gitlab-ci/scons-build.sh - - LLVM_VERSION=9 .gitlab-ci/scons-build.sh - -scons-old-llvm: - extends: - - scons - - .use-x86_build_old - script: - - LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh - .test: extends: - .ci-run-policy @@ -584,7 +622,7 @@ scons-old-llvm: LIBGL_ALWAYS_SOFTWARE: 1 PIGLIT_NO_WINDOW: 1 script: - - artifacts/piglit/run.sh + - install/piglit/run.sh piglit-quick_gl: extends: .piglit-test @@ -621,7 +659,7 @@ piglit-quick_shader: variables: DEQP_SKIPS: deqp-default-skips.txt script: - - ./artifacts/deqp-runner.sh + - ./install/deqp-runner.sh .deqp-test-gl: extends: @@ -638,7 +676,7 @@ piglit-quick_shader: .fossilize-test: extends: .test-vk script: - - ./artifacts/fossilize-runner.sh + - ./install/fossilize-runner.sh llvmpipe-gles2: variables: @@ -675,6 +713,19 @@ softpipe-gles31: DEQP_VER: gles31 extends: softpipe-gles2 +# Rules for tests that should not be present in MRs or the main +# project's pipeline (don't block marge or report red on +# mesa/mesamaster) but should be present on pipelines in personal +# branches (so you can opt in to running the flaky test when you want +# to). +.test-manual: + rules: + - if: '$CI_PROJECT_PATH != "mesa/mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME' + changes: + *all_paths + when: manual + - when: never + arm64_a630_gles2: extends: - .deqp-test-gl @@ -711,9 +762,9 @@ arm64_a306_gles2: extends: - .baremetal-test - .use-arm_build - stage: freedreno + - .freedreno-rules variables: - BM_KERNEL: /lava-files/Image + BM_KERNEL: /lava-files/Image.gz BM_DTB: /lava-files/apq8016-sbc.dtb BM_ROOTFS: /lava-files/rootfs-arm64 BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8" @@ -729,57 +780,83 @@ arm64_a306_gles2: - google-freedreno-db410c # Disabled due to flaky results -.arm64_a306_gles3: +arm64_a306_gles3: extends: - arm64_a306_gles2 + - .test-manual parallel: 8 variables: DEQP_VER: gles3 +arm64_a530_gles2: + extends: + - arm64_a306_gles2 + stage: freedreno + variables: + BM_KERNEL: /lava-files/db820c-kernel + BM_DTB: /lava-files/db820c.dtb + BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8" + DEQP_EXPECTED_FAILS: deqp-freedreno-a530-fails.txt + DEQP_SKIPS: deqp-freedreno-a530-skips.txt + tags: + - google-freedreno-db820c + +arm64_a530_gles3: + extends: + - arm64_a530_gles2 + - .test-manual + parallel: 6 + variables: + DEQP_VER: gles3 + # RADV CI .test-radv: extends: .radv-rules - stage: misc-tests + stage: radv variables: VK_DRIVER: radeon RADV_DEBUG: checkir -.test-radv-unsafe: - extends: .test-radv - # 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 manually for personal branches. - - when: manual - .test-radv-fossilize: extends: - .fossilize-test - .test-radv + script: + - ./install/fossilize-runner.sh + - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./install/fossilize-runner.sh +# Can only be triggered manually on personal branches because RADV is the only +# driver that does Vulkan testing at the moment. radv_polaris10_vkcts: extends: - .deqp-test-vk - - .test-radv-unsafe + - .test-radv + - .test-manual variables: DEQP_SKIPS: deqp-radv-polaris10-skips.txt tags: - polaris10 -radv-polaris10-fossils: - extends: .test-radv-fossilize - variables: - RADV_FORCE_FAMILY: "polaris10" # Force creating a null device +radv-fossils: + extends: + - .fossilize-test + - .test-radv + script: + # Polaris10 + - export RADV_FORCE_FAMILY="polaris10" + - ./install/fossilize-runner.sh + - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./install/fossilize-runner.sh + # Vega10 + - export RADV_FORCE_FAMILY="gfx900" + - ./install/fossilize-runner.sh + - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./install/fossilize-runner.sh + # Navi10 + - export RADV_FORCE_FAMILY="gfx1010" + - ./install/fossilize-runner.sh + - ACO_DEBUG=validateir,validatera RADV_PERFTEST=aco ./install/fossilize-runner.sh # Traces CI .traces-test: - stage: misc-tests cache: key: ${CI_JOB_NAME} paths: @@ -790,14 +867,14 @@ radv-polaris10-fossils: - .test-gl - .traces-test script: - - ./artifacts/tracie-runner-gl.sh + - ./install/tracie-runner-gl.sh .traces-test-vk: extends: - .test-vk - .traces-test script: - - ./artifacts/tracie-runner-vk.sh + - ./install/tracie-runner-vk.sh llvmpipe-traces: extends: @@ -811,7 +888,8 @@ llvmpipe-traces: radv-polaris10-traces: extends: - .traces-test-vk - - .test-radv-unsafe + - .test-radv + - .test-manual variables: DEVICE_NAME: "vk-amd-polaris10" tags: