ci: Also disable Windows container builds when down
Unlike all the other test configurations, we also want to drop the Windows container build when our Windows machines aren't available. Missed in !16055. Signed-off-by: Daniel Stone <daniels@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16077>
This commit is contained in:
parent
f2ddd59bf6
commit
0606c7b0db
|
@ -351,6 +351,10 @@ debian/arm_test:
|
|||
extends:
|
||||
- .container
|
||||
- .windows-docker-vs2019
|
||||
rules:
|
||||
- if: '$MICROSOFT_FARM == "offline"'
|
||||
when: never
|
||||
- !reference [.container-rules, rules]
|
||||
variables:
|
||||
GIT_STRATEGY: fetch # we do actually need the full repository though
|
||||
MESA_BASE_IMAGE: None
|
||||
|
@ -378,8 +382,10 @@ windows_test_vs2019:
|
|||
default: false
|
||||
extends:
|
||||
- .windows_container_build
|
||||
# Don't want the .container rules
|
||||
- .ci-run-policy
|
||||
rules:
|
||||
- if: '$MICROSOFT_FARM == "offline"'
|
||||
when: never
|
||||
- !reference [.ci-run-policy, rules]
|
||||
variables:
|
||||
MESA_IMAGE_PATH: &windows_test_image_path ${WINDOWS_X64_TEST_PATH}
|
||||
MESA_IMAGE_TAG: &windows_test_image_tag ${WINDOWS_X64_BUILD_TAG}--${WINDOWS_X64_TEST_TAG}
|
||||
|
@ -411,4 +417,4 @@ windows_test_vs2019:
|
|||
image: "$MESA_IMAGE"
|
||||
variables:
|
||||
MESA_IMAGE_PATH: *windows_test_image_path
|
||||
MESA_IMAGE_TAG: *windows_test_image_tag
|
||||
MESA_IMAGE_TAG: *windows_test_image_tag
|
||||
|
|
Loading…
Reference in New Issue