Mesa (staging/22.1): ci: Also disable Windows container builds when down
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Apr 27 02:19:01 UTC 2022
Module: Mesa
Branch: staging/22.1
Commit: 68998c0c9aff7feb33613153f69f380ac8b5ff8e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=68998c0c9aff7feb33613153f69f380ac8b5ff8e
Author: Daniel Stone <daniels at collabora.com>
Date: Wed Apr 20 22:15:10 2022 +0100
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 at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16185>
---
.gitlab-ci/container/gitlab-ci.yml | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index a79c0d1391b..aa4580bb30a 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -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
\ No newline at end of file
+ MESA_IMAGE_TAG: *windows_test_image_tag
More information about the mesa-commit
mailing list