diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1750ca5a35..8410fabaf19 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -232,7 +232,45 @@ include: # Note: make sure the branches in this list are the same as in # `.build-only-delayed-rules` below. -.container+build-rules: +.container-rules: + rules: + - !reference [.common-rules, rules] + # Run when re-enabling a disabled farm, but not when disabling it + - !reference [.disable-farm-mr-rules, rules] + # Never run immediately after merging, as we just ran everything + - !reference [.never-post-merge-rules, rules] + # Only rebuild containers in merge pipelines if any tags have been + # changed, else we'll just use the already-built containers + - if: *is-merge-attempt + changes: &image_tags_path + - .gitlab-ci/image-tags.yml + when: on_success + # Same as above, but for pre-merge pipelines + - if: *is-merge-request + changes: *image_tags_path + when: manual + # Skip everything for pre-merge and merge pipelines which don't change + # anything in the build + - if: *is-merge-attempt + when: never + - if: *is-merge-request + when: never + # Build everything after someone bypassed the CI + - if: *is-push-to-upstream-default-branch + when: on_success + # Build everything when pushing to staging branches + - if: *is-push-to-upstream-staging-branch + when: on_success + # Scheduled pipelines reuse already-built containers + - if: *is-scheduled-pipeline + when: never + # Allow building everything in fork pipelines, but build nothing unless + # manually triggered + - when: manual + +# Note: make sure the branches in this list are the same as in +# `.build-only-delayed-rules` below. +.build-rules: rules: - !reference [.common-rules, rules] # Run when re-enabling a disabled farm, but not when disabling it diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 1d5109b116c..ebdb8ffeb05 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -1,6 +1,6 @@ # Shared between windows and Linux .build-common: - extends: .container+build-rules + extends: .build-rules # Cancel job if a newer commit is pushed to the same branch interruptible: true variables: diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 5a827304e14..bf396761865 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -54,7 +54,7 @@ stage: container timeout: 1h extends: - - .container+build-rules + - .container-rules - .incorporate-templates-commit tags: - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64 @@ -153,7 +153,8 @@ debian/x86_64_build-base: MESA_BASE_TAG: *debian-x86_64_build-base LLVM_VERSION: *debian-x86_64-llvm needs: - - debian/x86_64_build-base + - job: debian/x86_64_build-base + optional: true # Debian based x86_64 main build image debian/x86_64_build: @@ -174,7 +175,8 @@ debian/x86_64_build: MESA_IMAGE_TAG: *debian-x86_64_build LLVM_VERSION: *debian-x86_64-llvm needs: - - debian/x86_64_build + - job: debian/x86_64_build + optional: true # Debian based x86_32 cross-build image debian/x86_32_build: @@ -194,7 +196,8 @@ debian/x86_32_build: MESA_IMAGE_TAG: *debian-x86_32_build LLVM_VERSION: *debian-x86_64-llvm needs: - - debian/x86_32_build + - job: debian/x86_32_build + optional: true # Debian based ppc64el cross-build image debian/ppc64el_build: @@ -215,7 +218,8 @@ debian/ppc64el_build: MESA_IMAGE_TAG: *debian-ppc64el_build LLVM_VERSION: *debian-ppc64el-llvm needs: - - debian/ppc64el_build + - job: debian/ppc64el_build + optional: true # Debian based s390x cross-build image debian/s390x_build: @@ -236,7 +240,8 @@ debian/s390x_build: MESA_IMAGE_TAG: *debian-s390x_build LLVM_VERSION: *debian-s390x-llvm needs: - - debian/s390x_build + - job: debian/s390x_build + optional: true # Android NDK cross-build image .android-variables: @@ -274,7 +279,8 @@ debian/android_build: MESA_IMAGE_PATH: "debian/android_build" MESA_IMAGE_TAG: *debian-android_build needs: - - debian/android_build + - job: debian/android_build + optional: true # Debian based ARM build image debian/arm64_build: @@ -299,7 +305,8 @@ debian/arm64_build: MESA_ARTIFACTS_TAG: *debian-arm64_build LLVM_VERSION: *debian-arm64-llvm needs: - - debian/arm64_build + - job: debian/arm64_build + optional: true # Alpine based x86_64 build image .alpine/x86_64_build-base: @@ -318,13 +325,13 @@ alpine/x86_64_build: MESA_IMAGE_TAG: &alpine-x86_64_build ${ALPINE_X86_64_BUILD_TAG} LLVM_VERSION: &alpine-llvm_version 19 rules: + - !reference [.container, rules] # Note: the next three lines must remain in that order, so that the rules # in `linkcheck-docs` catch nightly pipelines before the rules in `deploy-docs` # exclude them. - !reference [linkcheck-docs, rules] - !reference [deploy-docs, rules] - !reference [test-docs, rules] - - !reference [.container, rules] .use-alpine/x86_64_build: tags: @@ -336,7 +343,8 @@ alpine/x86_64_build: MESA_IMAGE_TAG: *alpine-x86_64_build LLVM_VERSION: *alpine-llvm_version needs: - - alpine/x86_64_build + - job: alpine/x86_64_build + optional: true # Alpine based x86_64 image for LAVA SSH dockerized client alpine/x86_64_lava_ssh_client: @@ -372,7 +380,8 @@ fedora/x86_64_build: MESA_IMAGE_TAG: *fedora-x86_64_build LLVM_VERSION: *fedora-x86_64-llvm needs: - - fedora/x86_64_build + - job: fedora/x86_64_build + optional: true # Debian based x86_64 test image base debian/x86_64_test-base: @@ -395,7 +404,8 @@ debian/x86_64_test-base: MESA_BASE_TAG: *debian-x86_64_test-base LLVM_VERSION: *debian-x86_64-llvm needs: - - debian/x86_64_test-base + - job: debian/x86_64_test-base + optional: true # Debian based ARMv7/armhf test image base debian/arm32_test-base: @@ -422,7 +432,8 @@ debian/arm32_test-base: LLVM_VERSION: *debian-arm64-llvm FDO_DISTRIBUTION_PLATFORM: "linux/arm/v7" needs: - - debian/arm32_test-base + - job: debian/arm32_test-base + optional: true # Debian based aarch64 test image base debian/arm64_test-base: @@ -447,7 +458,8 @@ debian/arm64_test-base: MESA_BASE_TAG: *debian-arm64_test-base LLVM_VERSION: *debian-arm64-llvm needs: - - debian/arm64_test-base + - job: debian/arm64_test-base + optional: true # Debian based x86_64 test image for GL debian/x86_64_test-gl: @@ -468,7 +480,8 @@ debian/x86_64_test-gl: MESA_IMAGE_PATH: "debian/x86_64_test-gl" MESA_IMAGE_TAG: *debian-x86_64_test-gl needs: - - debian/x86_64_test-gl + - job: debian/x86_64_test-gl + optional: true # Debian based x86_64 test image for VK debian/x86_64_test-vk: @@ -489,7 +502,8 @@ debian/x86_64_test-vk: MESA_IMAGE_PATH: "debian/x86_64_test-vk" MESA_IMAGE_TAG: *debian-x86_64_test-vk needs: - - debian/x86_64_test-vk + - job: debian/x86_64_test-vk + optional: true # Debian based x86_64 test image for Android debian/x86_64_test-android: @@ -511,7 +525,8 @@ debian/x86_64_test-android: MESA_IMAGE_PATH: "debian/x86_64_test-android" MESA_IMAGE_TAG: *debian-x86_64_test-android needs: - - debian/x86_64_test-android + - job: debian/x86_64_test-android + optional: true # Debian based x86_64 test image for video debian/x86_64_test-video: @@ -532,7 +547,8 @@ debian/x86_64_test-video: MESA_IMAGE_PATH: "debian/x86_64_test-video" MESA_IMAGE_TAG: *debian-x86_64_test-video needs: - - debian/x86_64_test-video + - job: debian/x86_64_test-video + optional: true # Debian based ARMv7/armhf test image for GL debian/arm32_test-gl: @@ -555,7 +571,8 @@ debian/arm32_test-gl: MESA_IMAGE_PATH: "debian/arm32_test-gl" MESA_IMAGE_TAG: *debian-arm32_test-gl needs: - - debian/arm32_test-gl + - job: debian/arm32_test-gl + optional: true # Debian based ARMv7/armhf test image for VK debian/arm32_test-vk: @@ -579,7 +596,8 @@ debian/arm32_test-vk: MESA_IMAGE_PATH: "debian/arm32_test-vk" MESA_IMAGE_TAG: *debian-arm32_test-vk needs: - - debian/arm32_test-vk + - job: debian/arm32_test-vk + optional: true # Debian based aarch64 test image for GL debian/arm64_test-gl: @@ -602,7 +620,8 @@ debian/arm64_test-gl: MESA_IMAGE_PATH: "debian/arm64_test-gl" MESA_IMAGE_TAG: *debian-arm64_test-gl needs: - - debian/arm64_test-gl + - job: debian/arm64_test-gl + optional: true # Debian based aarch64 test image for VK debian/arm64_test-vk: @@ -625,7 +644,8 @@ debian/arm64_test-vk: MESA_IMAGE_PATH: "debian/arm64_test-vk" MESA_IMAGE_TAG: *debian-arm64_test-vk needs: - - debian/arm64_test-vk + - job: debian/arm64_test-vk + optional: true # x86_64 image with ARM64 & ARM32 kernel & rootfs for baremetal testing .debian/baremetal_arm_test: @@ -641,7 +661,8 @@ debian/baremetal_arm32_test-gl: extends: - .debian/baremetal_arm_test needs: - - debian/arm32_test-gl + - job: debian/arm32_test-gl + optional: true variables: MESA_IMAGE_TAG: &baremetal-arm32_test-gl "${DEBIAN_TEST_GL_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}" LAVA_DISTRIBUTION_TAG: "debian/arm32_test-gl:${DEBIAN_TEST_GL_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}" @@ -650,7 +671,8 @@ debian/baremetal_arm64_test-gl: extends: - .debian/baremetal_arm_test needs: - - debian/arm64_test-gl + - job: debian/arm64_test-gl + optional: true variables: MESA_IMAGE_TAG: &baremetal-arm64_test-gl "${DEBIAN_TEST_GL_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}" LAVA_DISTRIBUTION_TAG: "debian/arm64_test-gl:${DEBIAN_TEST_GL_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}" @@ -659,7 +681,8 @@ debian/baremetal_arm64_test-vk: extends: - .debian/baremetal_arm_test needs: - - debian/arm64_test-vk + - job: debian/arm64_test-vk + optional: true variables: MESA_IMAGE_TAG: &baremetal-arm64_test-vk "${DEBIAN_TEST_VK_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}" LAVA_DISTRIBUTION_TAG: "debian/arm64_test-vk:${DEBIAN_TEST_VK_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}" @@ -670,7 +693,8 @@ debian/baremetal_arm64_test-vk: MESA_IMAGE_PATH: "debian/baremetal_arm32_test-gl" MESA_IMAGE_TAG: *baremetal-arm32_test-gl needs: - - debian/baremetal_arm32_test-gl + - job: debian/baremetal_arm32_test-gl + optional: true .use-debian/baremetal_arm64_test-gl: image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}" @@ -678,7 +702,8 @@ debian/baremetal_arm64_test-vk: MESA_IMAGE_PATH: "debian/baremetal_arm64_test-gl" MESA_IMAGE_TAG: *baremetal-arm64_test-gl needs: - - debian/baremetal_arm64_test-gl + - job: debian/baremetal_arm64_test-gl + optional: true .use-debian/baremetal_arm64_test-vk: image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}" @@ -686,7 +711,8 @@ debian/baremetal_arm64_test-vk: MESA_IMAGE_PATH: "debian/baremetal_arm64_test-vk" MESA_IMAGE_TAG: *baremetal-arm64_test-vk needs: - - debian/baremetal_arm64_test-vk + - job: debian/baremetal_arm64_test-vk + optional: true # Native Windows docker builds # @@ -717,7 +743,7 @@ debian/baremetal_arm64_test-vk: rules: - !reference [.common-rules, rules] - !reference [.microsoft-farm-container-rules, rules] - - !reference [.container+build-rules, rules] + - !reference [.container-rules, rules] variables: GIT_STRATEGY: fetch # we do actually need the full repository though MESA_BASE_IMAGE: None @@ -744,7 +770,7 @@ windows_build_msvc: rules: - !reference [.common-rules, rules] - !reference [.microsoft-farm-rules, rules] - - !reference [.container+build-rules, rules] + - !reference [.container-rules, rules] variables: MESA_IMAGE_PATH: &windows_build_image_path "windows/x86_64_build" MESA_IMAGE_TAG: &windows_build_image_tag ${WINDOWS_X64_MSVC_TAG}--${WINDOWS_X64_BUILD_TAG} @@ -753,7 +779,8 @@ windows_build_msvc: MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_BASE_IMAGE_PATH}:${WINDOWS_X64_MSVC_TAG}" timeout: 2h 30m # LLVM takes ages needs: - - windows_msvc + - job: windows_msvc + optional: true windows_test_msvc: inherit: @@ -763,7 +790,7 @@ windows_test_msvc: rules: - !reference [.common-rules, rules] - !reference [.microsoft-farm-rules, rules] - - !reference [.container+build-rules, rules] + - !reference [.container-rules, rules] variables: MESA_IMAGE_PATH: &windows_test_image_path "windows/x86_64_test" MESA_IMAGE_TAG: &windows_test_image_tag ${WINDOWS_X64_MSVC_TAG}--${WINDOWS_X64_TEST_TAG} @@ -772,7 +799,8 @@ windows_test_msvc: MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_BASE_IMAGE_PATH}:${WINDOWS_X64_MSVC_TAG}" timeout: 2h 30m needs: - - windows_msvc + - job: windows_msvc + optional: true .use-windows_build_msvc: inherit: @@ -783,7 +811,8 @@ windows_test_msvc: MESA_IMAGE_PATH: *windows_build_image_path MESA_IMAGE_TAG: *windows_build_image_tag needs: - - windows_build_msvc + - job: windows_build_msvc + optional: true .use-windows_test_msvc: inherit: diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml index efa3f0a1ac2..7127f4df983 100644 --- a/.gitlab-ci/lava/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava/lava-gitlab-ci.yml @@ -61,8 +61,10 @@ variables: - !reference [.required-for-hardware-jobs, needs] - job: alpine/x86_64_lava_ssh_client artifacts: false + optional: true - job: alpine/x86_64_lava-trigger artifacts: false + optional: true .lava-x86_64-test: extends: @@ -82,6 +84,7 @@ variables: - !reference [.lava-test, needs] - job: debian/x86_64_test-gl artifacts: false + optional: true - job: debian-x86_64 artifacts: false @@ -93,6 +96,7 @@ variables: - !reference [.lava-test, needs] - job: debian/x86_64_test-video artifacts: false + optional: true - job: debian-x86_64 artifacts: false @@ -104,6 +108,7 @@ variables: - !reference [.lava-test, needs] - job: debian/x86_64_test-vk artifacts: false + optional: true - job: debian-x86_64 artifacts: false @@ -125,6 +130,7 @@ variables: - !reference [.lava-test, needs] - job: debian/arm32_test-gl artifacts: false + optional: true - job: debian-arm32 artifacts: false @@ -146,6 +152,7 @@ variables: - !reference [.lava-test, needs] - job: debian/arm64_test-gl artifacts: false + optional: true - job: debian-arm64 artifacts: false @@ -157,6 +164,7 @@ variables: - !reference [.lava-test, needs] - job: debian/arm64_test-vk artifacts: false + optional: true - job: debian-arm64 artifacts: false diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index b3dbb32be34..5f2aa89d25c 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -126,8 +126,9 @@ yaml-toml-shell-py-test: - .test - .use-debian/x86_64_test-gl needs: - - debian/x86_64_test-gl - - debian-x86_64 + - job: debian/x86_64_test-gl + optional: true + - job: debian-x86_64 - !reference [.required-for-hardware-jobs, needs] variables: DEBIAN_ARCH: amd64 @@ -138,8 +139,9 @@ yaml-toml-shell-py-test: - .test - .use-debian/x86_64_test-vk needs: - - debian-x86_64 - - debian/x86_64_test-vk + - job: debian-x86_64 + - job: debian/x86_64_test-vk + optional: true - !reference [.required-for-hardware-jobs, needs] variables: DEBIAN_ARCH: amd64 @@ -150,7 +152,8 @@ yaml-toml-shell-py-test: - .test - .use-debian/x86_64_test-gl needs: - - debian/x86_64_test-gl + - job: debian/x86_64_test-gl + optional: true - !reference [.required-for-hardware-jobs, needs] variables: S3_ARTIFACT_NAME: mesa-x86_64-default-debugoptimized @@ -175,6 +178,7 @@ yaml-toml-shell-py-test: artifacts: false # The Android build will be downloaded later - job: debian/x86_64_test-android artifacts: false + optional: true - !reference [.required-for-hardware-jobs, needs] timeout: 20m script: @@ -291,7 +295,8 @@ yaml-toml-shell-py-test: DEBIAN_ARCH: armhf S3_ARTIFACT_NAME: mesa-arm32-default-debugoptimized needs: - - debian/baremetal_arm32_test-gl + - job: debian/baremetal_arm32_test-gl + optional: true - job: debian-arm32 artifacts: false - !reference [.required-for-hardware-jobs, needs] @@ -305,7 +310,8 @@ yaml-toml-shell-py-test: DEBIAN_ARCH: arm64 S3_ARTIFACT_NAME: mesa-arm64-default-debugoptimized needs: - - debian/baremetal_arm64_test-gl + - job: debian/baremetal_arm64_test-gl + optional: true - job: debian-arm64 artifacts: false - !reference [.required-for-hardware-jobs, needs] @@ -319,7 +325,8 @@ yaml-toml-shell-py-test: DEBIAN_ARCH: arm64 S3_ARTIFACT_NAME: mesa-arm64-default-debugoptimized needs: - - debian/baremetal_arm64_test-vk + - job: debian/baremetal_arm64_test-vk + optional: true - job: debian-arm64 artifacts: false - !reference [.required-for-hardware-jobs, needs] @@ -330,7 +337,8 @@ yaml-toml-shell-py-test: S3_ARTIFACT_NAME: mesa-arm32-asan-debugoptimized DEQP_FORCE_ASAN: 1 needs: - - debian/baremetal_arm32_test-gl + - job: debian/baremetal_arm32_test-gl + optional: true - job: debian-arm32-asan artifacts: false - !reference [.required-for-hardware-jobs, needs] @@ -340,7 +348,8 @@ yaml-toml-shell-py-test: S3_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized DEQP_FORCE_ASAN: 1 needs: - - debian/baremetal_arm64_test-gl + - job: debian/baremetal_arm64_test-gl + optional: true - job: debian-arm64-asan artifacts: false - !reference [.required-for-hardware-jobs, needs] @@ -350,7 +359,8 @@ yaml-toml-shell-py-test: S3_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized DEQP_FORCE_ASAN: 1 needs: - - debian/baremetal_arm64_test-vk + - job: debian/baremetal_arm64_test-vk + optional: true - job: debian-arm64-asan artifacts: false - !reference [.required-for-hardware-jobs, needs] @@ -362,7 +372,8 @@ yaml-toml-shell-py-test: variables: S3_ARTIFACT_NAME: mesa-arm64-ubsan-debugoptimized needs: - - debian/baremetal_arm64_test-gl + - job: debian/baremetal_arm64_test-gl + optional: true - job: debian-arm64-ubsan artifacts: false - !reference [.required-for-hardware-jobs, needs] @@ -374,7 +385,8 @@ yaml-toml-shell-py-test: variables: S3_ARTIFACT_NAME: mesa-arm64-ubsan-debugoptimized needs: - - debian/baremetal_arm64_test-vk + - job: debian/baremetal_arm64_test-vk + optional: true - job: debian-arm64-ubsan artifacts: false - !reference [.required-for-hardware-jobs, needs] @@ -471,6 +483,7 @@ yaml-toml-shell-py-test: needs: - job: debian/x86_64_test-vk artifacts: false + optional: true - job: debian-x86_64 artifacts: false - !reference [.ci-tron-test, needs] @@ -484,6 +497,7 @@ yaml-toml-shell-py-test: needs: - job: debian/x86_64_test-vk artifacts: false + optional: true - job: debian-build-x86_64 artifacts: false - !reference [.ci-tron-test, needs] @@ -495,6 +509,7 @@ yaml-toml-shell-py-test: needs: - job: debian/x86_64_test-gl artifacts: false + optional: true - job: debian-x86_64 artifacts: false - !reference [.ci-tron-test, needs] @@ -508,6 +523,7 @@ yaml-toml-shell-py-test: needs: - job: debian/x86_64_test-gl artifacts: false + optional: true - job: debian-build-x86_64 artifacts: false - !reference [.ci-tron-test, needs] @@ -527,6 +543,7 @@ yaml-toml-shell-py-test: needs: - job: debian/arm64_test-vk artifacts: false + optional: true - job: debian-arm64 artifacts: false - !reference [.ci-tron-test, needs] @@ -538,6 +555,7 @@ yaml-toml-shell-py-test: needs: - job: debian/arm64_test-gl artifacts: false + optional: true - job: debian-arm64 artifacts: false - !reference [.ci-tron-test, needs] @@ -557,6 +575,7 @@ yaml-toml-shell-py-test: needs: - job: debian/arm32_test-vk artifacts: false + optional: true - job: debian-arm32 artifacts: false - !reference [.ci-tron-test, needs] @@ -568,6 +587,7 @@ yaml-toml-shell-py-test: needs: - job: debian/arm32_test-gl artifacts: false + optional: true - job: debian-arm32 artifacts: false - !reference [.ci-tron-test, needs] @@ -582,6 +602,7 @@ yaml-toml-shell-py-test: needs: - job: debian/arm32_test-gl artifacts: false + optional: true - job: debian-arm32-asan artifacts: false - !reference [.ci-tron-test, needs] diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml index c4337f16b47..4e587eed320 100644 --- a/src/freedreno/ci/gitlab-ci-inc.yml +++ b/src/freedreno/ci/gitlab-ci-inc.yml @@ -199,7 +199,8 @@ # Ensure that we are using the release build artifact S3_ARTIFACT_NAME: mesa-arm64-default-release needs: - - debian/baremetal_arm64_test-gl + - job: debian/baremetal_arm64_test-gl + optional: true - debian-arm64-release dependencies: null @@ -216,7 +217,8 @@ # Ensure that we are using the release build artifact S3_ARTIFACT_NAME: mesa-arm64-default-release needs: - - alpine/x86_64_lava-trigger + - job: alpine/x86_64_lava-trigger + optional: true - job: debian-arm64-release artifacts: false # we pull the artifacts from S3 dependencies: null diff --git a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml index b8149e588fb..e0edaeb5db8 100644 --- a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml +++ b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml @@ -6,8 +6,9 @@ dependencies: - windows-msvc needs: - - windows-msvc - - windows_test_msvc + - job: windows-msvc + - job: windows_test_msvc + optional: true - !reference [.required-for-hardware-jobs, needs] variables: GIT_STRATEGY: none # testing doesn't build anything from source diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml index 21ea5b6a245..5a12d811a50 100644 --- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml +++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml @@ -7,8 +7,9 @@ llvmpipe-piglit-rusticl: - .llvmpipe-rusticl-rules - .test-piglit needs: - - debian-x86_64 - - debian/x86_64_test-gl + - job: debian-x86_64 + - job: debian/x86_64_test-gl + optional: true variables: DEQP_SUITE: llvmpipe-rusticl GPU_VERSION: llvmpipe-rusticl @@ -63,8 +64,9 @@ llvmpipe-deqp-asan: S3_ARTIFACT_NAME: mesa-x86_64-asan-debugoptimized extends: .llvmpipe-deqp-test needs: - - debian/x86_64_test-gl - - debian-x86_64-asan + - job: debian/x86_64_test-gl + optional: true + - job: debian-x86_64-asan .android-llvmpipe: extends: diff --git a/src/gallium/drivers/softpipe/ci/gitlab-ci.yml b/src/gallium/drivers/softpipe/ci/gitlab-ci.yml index 4e592b970aa..8a43ce329be 100644 --- a/src/gallium/drivers/softpipe/ci/gitlab-ci.yml +++ b/src/gallium/drivers/softpipe/ci/gitlab-ci.yml @@ -26,5 +26,6 @@ softpipe-asan-gles31: timeout: 10m extends: .softpipe-deqp-test needs: - - debian/x86_64_test-gl - - debian-x86_64-asan + - job: debian/x86_64_test-gl + optional: true + - job: debian-x86_64-asan diff --git a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml index 5596e10d243..d7abbd91712 100644 --- a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml +++ b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml @@ -30,8 +30,9 @@ lavapipe-vk-asan: DEQP_FORCE_ASAN: 1 S3_ARTIFACT_NAME: mesa-x86_64-asan-debugoptimized needs: - - debian/x86_64_test-vk - - debian-x86_64-asan + - job: debian/x86_64_test-vk + optional: true + - job: debian-x86_64-asan lavapipe-vkd3d: stage: software-renderer-nightly diff --git a/src/intel/ci/gitlab-ci-inc.yml b/src/intel/ci/gitlab-ci-inc.yml index e3e0d90ae01..4f5133e7d95 100644 --- a/src/intel/ci/gitlab-ci-inc.yml +++ b/src/intel/ci/gitlab-ci-inc.yml @@ -130,8 +130,9 @@ JOB_PRIORITY: 40 S3_ARTIFACT_NAME: mesa-x86_64-default-release needs: - - debian/x86_64_test-gl - - debian-release + - job: debian/x86_64_test-gl + optional: true + - job: debian-release .anv-rules: stage: intel diff --git a/src/microsoft/ci/gitlab-ci.yml b/src/microsoft/ci/gitlab-ci.yml index aa54ac25133..06ce9a9df32 100644 --- a/src/microsoft/ci/gitlab-ci.yml +++ b/src/microsoft/ci/gitlab-ci.yml @@ -10,8 +10,9 @@ test-spirv2dxil-windows: dependencies: - windows-msvc needs: - - windows-msvc - - windows_test_msvc + - job: windows-msvc + - job: windows_test_msvc + optional: true - !reference [.required-for-hardware-jobs, needs] variables: GIT_STRATEGY: none # testing doesn't build anything from source @@ -32,8 +33,9 @@ test-dozen-deqp: dependencies: - windows-msvc needs: - - windows-msvc - - windows_test_msvc + - job: windows-msvc + - job: windows_test_msvc + optional: true - !reference [.required-for-hardware-jobs, needs] variables: GIT_STRATEGY: none # testing doesn't build anything from source