OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: don't run everything just because a farm gets re-enabled

Browse Source 
Let the other rules take care of this, as they did before
7cf13ea504.

Fixes: 7cf13ea504 ("ci: skip containers & build jobs when disabling a farm")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25151>
This commit is contained in:
Eric Engestrom
2023-09-11 14:39:06 +01:00
committed by Marge Bot
parent 907b96f1e7
commit 1c3097225a
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@@ -174,8 +174,8 @@ include:
- include/**/* - include/**/*
- src/**/* - src/**/*
when: on_success when: on_success
# Run when re-enabling a disabled farm, but not when disabling it # Don't run when disabling a farm
- !reference [.re-enable-farm-rules, rules] - !reference [.disable-farm-rules, rules]
# Otherwise, build/test jobs won't run because no rule matched. # Otherwise, build/test jobs won't run because no rule matched.
@@ -200,8 +200,8 @@ include:
- .gitlab-ci.yml - .gitlab-ci.yml
- .gitlab-ci/**/* - .gitlab-ci/**/*
when: on_success when: on_success
# Run when re-enabling a disabled farm, but not when disabling it # Don't run when disabling a farm
- !reference [.re-enable-farm-rules, rules] - !reference [.disable-farm-rules, rules]
# Run pipeline by default if it was triggered by Marge Bot, is for a # Run pipeline by default if it was triggered by Marge Bot, is for a
# merge request, and any files affecting the pipeline were changed # merge request, and any files affecting the pipeline were changed
- if: *is-pre-merge-for-marge - if: *is-pre-merge-for-marge

8
.gitlab-ci/farm-rules.yml
View File

@@ -238,9 +238,8 @@
- !reference [.freedreno-farm-rules, rules] - !reference [.freedreno-farm-rules, rules]
# Skip container & build jobs when disabling any farm, and run them if any farm # Skip container & build jobs when disabling any farm
# gets re-enabled. .disable-farm-rules:
.re-enable-farm-rules:
rules: rules:
# changes(disabled) + exists(disabled) = disabling the farm # changes(disabled) + exists(disabled) = disabling the farm
- changes: [ .ci-farms-disabled/microsoft ] - changes: [ .ci-farms-disabled/microsoft ]
@@ -270,6 +269,3 @@
- changes: [ .ci-farms-disabled/freedreno ] - changes: [ .ci-farms-disabled/freedreno ]
exists: [ .ci-farms-disabled/freedreno ] exists: [ .ci-farms-disabled/freedreno ]
when: never when: never
# Any other change to ci-farms-disabled/* means some farm is getting re-enabled
- changes: [ .ci-farms-disabled/* ]
when: on_success