diff options
| author | Eric Engestrom <eric@igalia.com> | 2023-09-15 12:09:43 +0100 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-09-15 16:07:17 +0000 |
| commit | 83d856d4bc8e66dab57d87cd572ae9bcdb5a2ab9 (patch) | |
| tree | dd1c7c297e6b5b4f9e18f0120af8d42a2a62af6a /.gitlab-ci.yml | |
| parent | 67c7f391b3e9e3794cf3ed05c06e95c8f81c752f (diff) | |
ci/farm-rules: re-add "run every container and build job when a farm gets re-enabled"
Turns out I was right the first time, I was just missing that this
should only be done in MRs, which @daniels added in 16527f6ffd0129f2f6e1.
Without this, a "farm re-enable" pipeline will run all the jobs for that
farm, but will have none of the container & build jobs to support these
tests.
This reverts commit 1c3097225a4af294720e111eab3f58d590b85c8c.
Fixes: 1c3097225a4af294720e ("ci: don't run everything just because a farm gets re-enabled")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25243>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e3731186247..06ecbe8f384 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -156,7 +156,7 @@ include: # When to automatically run the CI for build jobs .build-rules: rules: - # Don't run when disabling a farm + # Run when re-enabling a disabled farm, but not when disabling it - !reference [.disable-farm-mr-rules, rules] # If any files affecting the pipeline are changed, build/test jobs run # automatically once all dependency jobs have passed @@ -200,7 +200,7 @@ include: .container-rules: rules: - # Don't run when disabling a farm + # Run when re-enabling a disabled farm, but not when disabling it - !reference [.disable-farm-mr-rules, rules] # Run pipeline by default in the main project if any CI pipeline # configuration files were changed, to ensure docker images are up to date |