ci/microsoft: rename manual rules according to rest introduced rules

Reviewed-by: Eric Engestrom <eric@igalia.com>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23846>
This commit is contained in:
David Heidelberg 2023-07-02 22:20:05 +02:00 committed by Marge Bot
parent 4403797b71
commit c9de0d2977
2 changed files with 11 additions and 11 deletions

View File

@ -437,7 +437,7 @@ debian/arm64_test:
- .container
- .windows-docker-vs2019
rules:
- !reference [.microsoft-farm-container-rules, rules]
- !reference [.microsoft-farm-manual-rules, rules]
- !reference [.container-rules, rules]
variables:
GIT_STRATEGY: fetch # we do actually need the full repository though

View File

@ -269,16 +269,6 @@
when: on_success
# Farm rules
.microsoft-farm-container-rules:
rules:
# Allow triggering jobs manually in other cases if any files affecting the
# pipeline were changed
- exists: [ .ci-farms-disabled/microsoft ]
when: never
- changes: [ .ci-farms-disabled/microsoft ]
when: manual
- !reference [.microsoft-farm-rules, rules]
.microsoft-farm-rules:
rules:
- exists: [ .ci-farms-disabled/microsoft ] # 1. Is disabled, never run
@ -289,6 +279,16 @@
when: never
# 4. Fall-through (other rules or on_success)
.microsoft-farm-manual-rules:
rules:
# Allow triggering jobs manually in other cases if any files affecting the
# pipeline were changed
- exists: [ .ci-farms-disabled/microsoft ]
when: never
- changes: [ .ci-farms-disabled/microsoft ]
when: manual
- !reference [.microsoft-farm-rules, rules]
.collabora-farm-rules:
rules:
- if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'