X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=e769069370d20e1621b32665a6a6d952d7bb1565;hb=64734c0947ecfb8908e6bdfd4e73a4c724019476;hp=12843417517c06b13abbcaf0f01b407bca04c261;hpb=0b6e03b8481ffd332946302305ed6535803bc55a;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 12843417517..e769069370d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,11 +32,18 @@ stages: - virgl - success +# 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 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 @@ -47,6 +54,7 @@ pages: paths: - public rules: + - *ignore_scheduled_pipelines - if: '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_REF_NAME == "master"' changes: &docs-or-ci - docs/**/* @@ -58,6 +66,7 @@ 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"' @@ -70,6 +79,7 @@ test-docs: # 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 @@ -106,6 +116,7 @@ success: stage: success image: debian:stable-slim rules: + - *ignore_scheduled_pipelines - if: '$CI_PROJECT_NAMESPACE == "mesa"' when: never - if: '$GITLAB_USER_LOGIN == "marge-bot"' @@ -152,6 +163,7 @@ success: 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"' @@ -161,7 +173,7 @@ success: when: on_success # Run pipeline by default if it was triggered by Marge Bot, is for a # merge request, and any files affecting the pipeline were changed - - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_PROJECT_PATH != "mesa/mesa"' + - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' changes: *all_paths when: on_success @@ -209,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-10" .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 @@ -224,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-10" .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 @@ -239,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-10" .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 @@ -261,7 +270,6 @@ s390x_build: TAG: *s390x_build image: "$CI_REGISTRY_IMAGE/debian/s390x_build:$TAG" needs: - - x86_build-base - s390x_build # Debian 10 based x86 test image base @@ -313,7 +321,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-10" .use-arm_build: variables: @@ -353,7 +361,6 @@ arm64_test: TAG: *arm64_test image: "$CI_REGISTRY_IMAGE/debian/arm64_test:$TAG" needs: - - arm_test-base - arm64_test # Native Windows docker builds @@ -399,14 +406,15 @@ arm64_test: git_archive: extends: .fdo.container-build@alpine stage: container+docs - only: - - schedules + 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@52dd4a94044449c8481d18dcdc221a3c636366d2' + 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-02" + FDO_DISTRIBUTION_TAG: &git-archive-tag "2020-07-07" FDO_DISTRIBUTION_PACKAGES: git py3-pip @@ -415,8 +423,9 @@ git_archive: make git archive: stage: git-archive extends: .fdo.suffixed-image@alpine - only: - - schedules + rules: + - if: '$CI_PIPELINE_SOURCE == "schedule"' + when: on_success # ensure we are running on packet tags: - packet.net @@ -506,7 +515,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" @@ -526,7 +535,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 @@ -541,6 +550,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 @@ -558,6 +568,7 @@ meson-classic: EXTRA_OPTION: > -D osmesa=classic -D tools=all + -D werror=true .meson-cross: extends: @@ -569,7 +580,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 @@ -601,6 +612,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 @@ -613,6 +626,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 @@ -685,7 +700,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 @@ -702,7 +717,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 @@ -791,13 +806,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: @@ -806,13 +816,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: @@ -981,6 +986,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 @@ -1030,6 +1036,8 @@ arm64_a630_gles2: arm64_a630_gles31: extends: arm64_a630_gles2 variables: + CI_NODE_INDEX: 1 + CI_NODE_TOTAL: 2 DEQP_VER: gles31 # gles31 is about 12 minutes with validation enabled. NIR_VALIDATE: 0 @@ -1037,13 +1045,15 @@ arm64_a630_gles31: arm64_a630_gles3: extends: arm64_a630_gles2 variables: + CI_NODE_INDEX: 1 + CI_NODE_TOTAL: 2 DEQP_VER: gles3 # gles3 is about 15 minutes with validation enabled. NIR_VALIDATE: 0 # We almost always manage to lower UBOs back to constant uploads in # the test suite, so get a little testing for it here. -arm64_a630_noubo: +.arm64_a630_noubo: extends: arm64_a630_gles31 variables: DEQP_VER: gles31 @@ -1053,7 +1063,7 @@ arm64_a630_noubo: # The driver does some guessing as to whether to render using gmem # or bypass, and some GLES3.1 features interact with either one. # Do a little testing with gmem and bypass forced. -arm64_a630_bypass: +.arm64_a630_bypass: extends: arm64_a630_gles31 variables: CI_NODE_INDEX: 1 @@ -1061,7 +1071,7 @@ arm64_a630_bypass: FD_MESA_DEBUG: nogmem DEQP_EXPECTED_FAILS: deqp-freedreno-a630-bypass-fails.txt -arm64_a630_traces: +.arm64_a630_traces: extends: - arm64_a630_gles2 variables: @@ -1076,7 +1086,7 @@ arm64_a630_traces: # 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) -arm64_a630_gmem: +.arm64_a630_gmem: extends: arm64_a630_gles31 variables: CI_NODE_INDEX: 1 @@ -1100,7 +1110,7 @@ arm64_a630_vk: # Do a separate sysmem pass over the testcases that really affect sysmem # rendering. This is currently very flaky, leave it as an option for devs # to click play on in their branches. -arm64_a630_vk_sysmem: +.arm64_a630_vk_sysmem: extends: - arm64_a630_vk variables: @@ -1145,9 +1155,7 @@ arm64_a306_gles2: script: - ./install/bare-metal/fastboot.sh needs: - - arm_test-base - arm64_test - - arm_build - meson-arm64 tags: - google-freedreno-db410c