X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=.gitlab-ci.yml;h=0247f057f011686e48c2e46b67eeec3671a8c3e8;hp=a59cfcd44580d407b156db02378eb29bf3b46bb5;hb=a38e21d6683aeecb51aea4f933a77c6e7f1a6179;hpb=7406d627c8864a8754efed14d0ad9d6a853325ac diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a59cfcd4458..0247f057f01 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"' + 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 - - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' + # merge request, 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 - # 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 @@ -272,7 +325,7 @@ arm_build: - .fdo.container-build@debian@arm64v8 - .container variables: - FDO_DISTRIBUTION_TAG: &arm_build "2020-06-22-tracie" + FDO_DISTRIBUTION_TAG: &arm_build "2020-07-07" .use-arm_build: variables: @@ -305,7 +358,7 @@ arm64_test: extends: - .use-arm_test-base variables: - FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-22-tracie" + FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-25-kernelfix" .use-arm64_test: variables: @@ -333,11 +386,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 +408,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 @@ -426,7 +520,7 @@ meson-testing: -D glx=dri -D gbm=enabled -D egl=enabled - -D platforms=x11,drm,surfaceless + -D platforms=x11,drm GALLIUM_ST: > -D dri3=enabled GALLIUM_DRIVERS: "swrast,virgl" @@ -446,7 +540,7 @@ meson-gallium: -D glx=dri -D gbm=enabled -D egl=enabled - -D platforms=x11,wayland,drm,surfaceless + -D platforms=x11,wayland,drm GALLIUM_ST: > -D dri3=enabled -D gallium-extra-hud=true @@ -461,6 +555,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 +573,7 @@ meson-classic: EXTRA_OPTION: > -D osmesa=classic -D tools=all + -D werror=true .meson-cross: extends: @@ -489,7 +585,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 +617,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 +631,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 +705,7 @@ meson-clover-old-llvm: -D glx=disabled -D egl=disabled -D gbm=disabled - -D platforms=drm,surfaceless + -D platforms=drm GALLIUM_DRIVERS: "i915,r600" script: - LLVM_VERSION=3.9 .gitlab-ci/meson-build.sh @@ -802,6 +902,11 @@ 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: @@ -896,6 +1001,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 +1082,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)