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

Let the other rules take care of this, as they did before
7cf13ea504e7e5be097e.

Fixes: 7cf13ea504e7e5be097e ("ci: skip containers & build jobs when disabling a farm")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25151>

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

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