From 0606c7b0dbc6415811ff3ddf87c2185cae1e48e9 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Wed, 20 Apr 2022 22:15:10 +0100 Subject: [PATCH] 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 Part-of: --- .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