X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=.gitlab-ci.yml;h=e97d9bf446d4827b439d89accefe4bd18c10840b;hp=a1d7f6944ecc75ff5d06387fb5774f585cff3517;hb=80f7b58d901859be216e17aaad21d6a9b34ac9ea;hpb=287bf5f20886f9581c26c519bb17813d4d4f1f71 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1d7f6944ec..e97d9bf446d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,17 +1,25 @@ variables: FDO_UPSTREAM_REPO: mesa/mesa + CI_PRE_CLONE_SCRIPT: |- + set -o xtrace + /usr/bin/wget -q -O- ${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/download-git-cache.sh | sh - + set +o xtrace include: - project: 'freedesktop/ci-templates' - ref: 59de540b620c45739871d1a073d76d5521989d11 + ref: &ci-templates-sha 52dd4a94044449c8481d18dcdc221a3c636366d2 file: '/templates/debian.yml' + - project: 'freedesktop/ci-templates' + ref: *ci-templates-sha + file: '/templates/alpine.yml' - local: '.gitlab-ci/lava-gitlab-ci.yml' - local: '.gitlab-ci/test-source-dep.yml' stages: - - deploy - - container + - container+docs - container-2 + - git-archive + - deploy - meson-x86_64 - scons - meson-misc @@ -24,22 +32,54 @@ stages: - virgl - success -pages: +# Generic rule to not run the job during scheduled pipelines +# ---------------------------------------------------------- +.scheduled_pipelines-rules: + rules: &ignore_scheduled_pipelines + if: '$CI_PIPELINE_SOURCE == "schedule"' + when: never + +.docs-base: + extends: .ci-run-policy image: alpine - stage: deploy script: - - apk --no-cache add py3-pip + - apk --no-cache add py3-pip graphviz - pip3 install sphinx sphinx_rtd_theme - sphinx-build -b html docs public + +pages: + extends: .docs-base + stage: deploy artifacts: paths: - public - only: - - master + rules: + - *ignore_scheduled_pipelines + - if: '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_REF_NAME == "master"' + changes: &docs-or-ci + - docs/**/* + - .gitlab-ci.yml + when: always + # Other cases default to never + +test-docs: + extends: .docs-base + stage: container+docs + rules: + - *ignore_scheduled_pipelines + - if: '$CI_PROJECT_NAMESPACE == "mesa"' + when: never + - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' + changes: *docs-or-ci + when: on_success + - changes: *docs-or-ci + when: manual + # Other cases default to never # When to automatically run the CI .ci-run-policy: rules: + - *ignore_scheduled_pipelines # If any files affecting the pipeline are changed, build/test jobs run # automatically once all dependency jobs have passed - changes: &all_paths @@ -75,11 +115,16 @@ pages: success: stage: success image: debian:stable-slim - only: - - merge_requests - except: - changes: - *all_paths + rules: + - *ignore_scheduled_pipelines + - if: '$CI_PROJECT_NAMESPACE == "mesa"' + when: never + - if: '$GITLAB_USER_LOGIN == "marge-bot"' + changes: *docs-or-ci + when: never + - changes: *all_paths + when: never + - when: on_success variables: GIT_STRATEGY: none script: @@ -114,24 +159,32 @@ success: # repository's registry will be used there as well. .container: - stage: container + stage: container+docs extends: - .ci-run-policy rules: + - *ignore_scheduled_pipelines + # Run pipeline by default in the main project if any CI pipeline + # configuration files were changed, to ensure docker images are up to date + - if: '$CI_PROJECT_PATH == "mesa/mesa"' + changes: + - .gitlab-ci.yml + - .gitlab-ci/**/* + when: on_success # Run pipeline by default if it was triggered by Marge Bot, is for a - # merge request, and any files affecting it were changed + # merge request, and any files affecting the pipeline 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"' + # Run pipeline by default in the main project if it was not triggered by + # Marge Bot, and any files affecting the pipeline were changed + - if: '$GITLAB_USER_LOGIN != "marge-bot" && $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 + # Allow triggering jobs manually in other cases if any files affecting the + # pipeline were changed - changes: *all_paths when: manual @@ -140,7 +193,7 @@ success: variables: FDO_DISTRIBUTION_VERSION: buster-slim FDO_REPO_SUFFIX: "debian/$CI_JOB_NAME" - FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh' + FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh' # no need to pull the whole repo to build the container image GIT_STRATEGY: none @@ -150,7 +203,7 @@ x86_build-base: - .fdo.container-build@debian - .container variables: - FDO_DISTRIBUTION_TAG: &x86_build-base "2020-06-12" + FDO_DISTRIBUTION_TAG: &x86_build-base "2020-07-21-tracie" .use-x86_build-base: extends: @@ -168,14 +221,13 @@ x86_build: extends: - .use-x86_build-base variables: - FDO_DISTRIBUTION_TAG: &x86_build "2020-06-02" + FDO_DISTRIBUTION_TAG: &x86_build "2020-07-21-tracie" .use-x86_build: variables: TAG: *x86_build image: "$CI_REGISTRY_IMAGE/debian/x86_build:$TAG" needs: - - x86_build-base - x86_build # Debian 10 based i386 cross-build image @@ -183,14 +235,13 @@ i386_build: extends: - .use-x86_build-base variables: - FDO_DISTRIBUTION_TAG: &i386_build "2020-06-02" + FDO_DISTRIBUTION_TAG: &i386_build "2020-07-21-tracie" .use-i386_build: variables: TAG: *i386_build image: "$CI_REGISTRY_IMAGE/debian/i386_build:$TAG" needs: - - x86_build-base - i386_build # Debian 10 based ppc64el cross-build image @@ -198,14 +249,13 @@ ppc64el_build: extends: - .use-x86_build-base variables: - FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-06-02" + FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-07-21-tracie" .use-ppc64el_build: variables: TAG: *ppc64el_build image: "$CI_REGISTRY_IMAGE/debian/ppc64el_build:$TAG" needs: - - x86_build-base - ppc64el_build # Debian 10 based s390x cross-build image @@ -213,21 +263,20 @@ s390x_build: extends: - .use-x86_build-base variables: - FDO_DISTRIBUTION_TAG: &s390x_build "2020-06-02" + FDO_DISTRIBUTION_TAG: &s390x_build "2020-07-21-tracie" .use-s390x_build: variables: TAG: *s390x_build image: "$CI_REGISTRY_IMAGE/debian/s390x_build:$TAG" needs: - - x86_build-base - s390x_build # Debian 10 based x86 test image base x86_test-base: extends: x86_build-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-base "2020-06-02" + FDO_DISTRIBUTION_TAG: &x86_test-base "2020-07-21-tracie" .use-x86_test-base: extends: @@ -244,19 +293,19 @@ x86_test-base: x86_test-gl: extends: .use-x86_test-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-06-15" + FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-07-21-tracie" # Debian 10 based x86 test image for VK x86_test-vk: extends: .use-x86_test-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-06-18-vkcts" + FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-07-21-gfxreconstruct-dev" # Debian 9 based x86 build image (old LLVM) x86_build_old: extends: x86_build-base variables: - FDO_DISTRIBUTION_TAG: &x86_build_old "2020-06-12" + FDO_DISTRIBUTION_TAG: &x86_build_old "2020-07-21-tracie" FDO_DISTRIBUTION_VERSION: stretch-slim .use-x86_build_old: @@ -272,7 +321,7 @@ arm_build: - .fdo.container-build@debian@arm64v8 - .container variables: - FDO_DISTRIBUTION_TAG: &arm_build "2020-06-12" + FDO_DISTRIBUTION_TAG: &arm_build "2020-07-21-tracie" .use-arm_build: variables: @@ -287,7 +336,7 @@ arm_test-base: - .fdo.container-build@debian - .container variables: - FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-09-rsync" + FDO_DISTRIBUTION_TAG: &arm_test-base "2020-07-18-nginx" .use-arm_test-base: extends: @@ -305,14 +354,13 @@ arm64_test: extends: - .use-arm_test-base variables: - FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-18-vkcts" + FDO_DISTRIBUTION_TAG: &arm64_test "2020-07-18-nginx" .use-arm64_test: variables: TAG: *arm64_test image: "$CI_REGISTRY_IMAGE/debian/arm64_test:$TAG" needs: - - arm_test-base - arm64_test # Native Windows docker builds @@ -333,11 +381,11 @@ arm64_test: 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: +.windows_build_vs2019: extends: - .container - .windows-docker-vs2019 - stage: container + stage: container+docs variables: GIT_STRATEGY: fetch # we do actually need the full repository though timeout: 4h # LLVM takes ages @@ -355,6 +403,47 @@ windows_build_vs2019: needs: - windows_build_vs2019 +git_archive: + extends: .fdo.container-build@alpine + stage: container+docs + rules: + - if: '$CI_PIPELINE_SOURCE == "schedule"' + when: always + variables: + FDO_REPO_SUFFIX: &git-archive-suffix "alpine/git_archive" + FDO_DISTRIBUTION_EXEC: 'pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@6f5af7e5574509726c79109e3c147cee95e81366' + # no need to pull the whole repo to build the container image + GIT_STRATEGY: none + FDO_DISTRIBUTION_TAG: &git-archive-tag "2020-07-07" + FDO_DISTRIBUTION_PACKAGES: git py3-pip + + +# Git archive + +make git archive: + stage: git-archive + extends: .fdo.suffixed-image@alpine + rules: + - if: '$CI_PIPELINE_SOURCE == "schedule"' + when: on_success + # ensure we are running on packet + tags: + - packet.net + variables: + FDO_DISTRIBUTION_TAG: *git-archive-tag + FDO_REPO_SUFFIX: *git-archive-suffix + needs: + - git_archive + + script: + # compress the current folder + - tar -cvzf ../$CI_PROJECT_NAME.tar.gz . + + # login with the JWT token + - ci-fairy minio login $CI_JOB_JWT + - ci-fairy minio cp ../$CI_PROJECT_NAME.tar.gz minio://minio-packet.freedesktop.org/git-cache/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_PROJECT_NAME.tar.gz + + # BUILD # Shared between windows and Linux @@ -411,10 +500,8 @@ windows_build_vs2019: - .build-linux - .use-x86_build stage: scons - variables: - SCONSFLAGS: "-j4" script: - - .gitlab-ci/scons-build.sh + - env SCONSFLAGS="-j${FDO_CI_CONCURRENT:-4}" .gitlab-ci/scons-build.sh meson-testing: extends: @@ -426,7 +513,7 @@ meson-testing: -D glx=dri -D gbm=enabled -D egl=enabled - -D platforms=x11,drm,surfaceless + -D platforms=x11 GALLIUM_ST: > -D dri3=enabled GALLIUM_DRIVERS: "swrast,virgl" @@ -446,7 +533,7 @@ meson-gallium: -D glx=dri -D gbm=enabled -D egl=enabled - -D platforms=x11,wayland,drm,surfaceless + -D platforms=x11,wayland GALLIUM_ST: > -D dri3=enabled -D gallium-extra-hud=true @@ -461,6 +548,7 @@ meson-gallium: EXTRA_OPTION: > -D osmesa=gallium -D tools=all + -D werror=true script: - .gitlab-ci/meson-build.sh - .gitlab-ci/run-shader-db.sh @@ -478,6 +566,7 @@ meson-classic: EXTRA_OPTION: > -D osmesa=classic -D tools=all + -D werror=true .meson-cross: extends: @@ -489,7 +578,7 @@ meson-classic: -D glx=disabled -D gbm=disabled -D egl=enabled - -D platforms=surfaceless + -D platforms=[] -D osmesa=none GALLIUM_ST: > -D dri3=disabled @@ -521,6 +610,8 @@ meson-armhf: LLVM_VERSION: "7" EXTRA_OPTION: > -D llvm=disabled + UPLOAD_FOR_LAVA: 1 + DEBIAN_ARCH: armhf script: - .gitlab-ci/meson-build.sh - .gitlab-ci/prepare-artifacts.sh @@ -533,6 +624,8 @@ meson-arm64: VULKAN_DRIVERS: "freedreno" EXTRA_OPTION: > -D llvm=disabled + UPLOAD_FOR_LAVA: 1 + DEBIAN_ARCH: arm64 script: - .gitlab-ci/meson-build.sh - .gitlab-ci/prepare-artifacts.sh @@ -605,7 +698,7 @@ meson-clover-old-llvm: -D glx=disabled -D egl=disabled -D gbm=disabled - -D platforms=drm,surfaceless + -D platforms=[] GALLIUM_DRIVERS: "i915,r600" script: - LLVM_VERSION=3.9 .gitlab-ci/meson-build.sh @@ -622,7 +715,7 @@ meson-vulkan: -D glx=disabled -D gbm=disabled -D egl=disabled - -D platforms=x11,wayland,drm + -D platforms=x11,wayland -D osmesa=none GALLIUM_ST: > -D dri3=enabled @@ -711,13 +804,8 @@ meson-mingw32-x86_64: TAG: *x86_test-gl image: "$CI_REGISTRY_IMAGE/debian/x86_test-gl:$TAG" needs: - - x86_build-base - - x86_build - meson-testing - - x86_test-base - x86_test-gl - dependencies: - - meson-testing .test-vk: extends: @@ -726,13 +814,8 @@ meson-mingw32-x86_64: TAG: *x86_test-vk image: "$CI_REGISTRY_IMAGE/debian/x86_test-vk:$TAG" needs: - - x86_build-base - - x86_build - meson-testing - - x86_test-base - x86_test-vk - dependencies: - - meson-testing .piglit-test: extends: @@ -756,7 +839,6 @@ piglit-quick_gl: 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 @@ -802,14 +884,18 @@ piglit-quick_shader: extends: .test-vk script: - ./install/fossilize-runner.sh + artifacts: + when: on_failure + name: "mesa_${CI_JOB_NAME}" + paths: + - results/ 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. + # Don't use threads inside llvmpipe, we've already got all cores + # busy at the deqp-runner level. LP_NUM_THREADS: 0 DEQP_EXPECTED_FAILS: deqp-llvmpipe-fails.txt LIBGL_ALWAYS_SOFTWARE: "true" @@ -843,11 +929,10 @@ softpipe-gles31: virgl-gles2-on-gl: variables: DEQP_VER: gles2 - DEQP_PARALLEL: 4 NIR_VALIDATE: 0 DEQP_NO_SAVE_RESULTS: 1 - # Don't use threads inside llvmpipe, we've already got all 4 cores - # busy with DEQP_PARALLEL. + # Don't use threads inside llvmpipe, we've already got all cores + # busy at the deqp-runner level. LP_NUM_THREADS: 0 DEQP_EXPECTED_FAILS: deqp-virgl-gl-fails.txt DEQP_OPTIONS: "--deqp-log-images=disable" @@ -896,6 +981,7 @@ virgl-gl32-on-gl: # to). .test-manual: rules: + - *ignore_scheduled_pipelines - if: '$CI_PROJECT_PATH != "mesa/mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME' changes: *all_paths @@ -976,6 +1062,18 @@ arm64_a630_bypass: FD_MESA_DEBUG: nogmem DEQP_EXPECTED_FAILS: deqp-freedreno-a630-bypass-fails.txt +arm64_a630_traces: + extends: + - arm64_a630_gles2 + variables: + BARE_METAL_TEST_SCRIPT: "/install/tracie-runner-gl.sh" + DEVICE_NAME: "freedreno-a630" + TRACIE_NO_UNIT_TESTS: 1 + # This lets us run several more traces which don't use any features we're + # missing. + MESA_GLSL_VERSION_OVERRIDE: "460" + MESA_GL_VERSION_OVERRIDE: "4.6" + # Along with checking gmem path, check that we don't get obvious nir # validation failures (though it's too expensive to have it on for the # full CTS) @@ -1048,9 +1146,7 @@ arm64_a306_gles2: script: - ./install/bare-metal/fastboot.sh needs: - - arm_test-base - arm64_test - - arm_build - meson-arm64 tags: - google-freedreno-db410c @@ -1115,7 +1211,6 @@ arm64_a530_gles31: stage: radv variables: VK_DRIVER: radeon - RADV_DEBUG: checkir ACO_DEBUG: validateir,validatera # Can only be triggered manually on personal branches because RADV is the only @@ -1138,23 +1233,18 @@ radv-fossils: # Pitcairn (GFX6) - export RADV_FORCE_FAMILY="pitcairn" - ./install/fossilize-runner.sh - - RADV_PERFTEST=aco ./install/fossilize-runner.sh # Bonaire (GFX7) - export RADV_FORCE_FAMILY="bonaire" - ./install/fossilize-runner.sh - - RADV_PERFTEST=aco ./install/fossilize-runner.sh # Polaris10 (GFX8) - export RADV_FORCE_FAMILY="polaris10" - ./install/fossilize-runner.sh - - RADV_PERFTEST=aco ./install/fossilize-runner.sh # Vega10 (GFX9) - export RADV_FORCE_FAMILY="gfx900" - ./install/fossilize-runner.sh - - RADV_PERFTEST=aco ./install/fossilize-runner.sh # Navi10 (GFX10) - export RADV_FORCE_FAMILY="gfx1010" - ./install/fossilize-runner.sh - - RADV_PERFTEST=aco ./install/fossilize-runner.sh # Traces CI .traces-test: @@ -1162,6 +1252,8 @@ radv-fossils: key: ${CI_JOB_NAME} paths: - traces-db/ + variables: + TRACIE_UPLOAD_TO_MINIO: 1 .traces-test-gl: extends: @@ -1196,6 +1288,16 @@ radv-polaris10-traces: tags: - polaris10 +radv-raven-traces: + extends: + - .traces-test-vk + - .test-radv + - .test-manual + variables: + DEVICE_NAME: "vk-amd-raven" + tags: + - raven + virgl-traces: extends: - .traces-test-gl