Fix mergify.yml (#1429)

kanisterio · May 4, 2022 · 3d4873e · 3d4873e
1 parent 04fc133
commit 3d4873e
Showing 1 changed file with 27 additions and 19 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,29 +1,37 @@
 queue_rules:
   - name: default
     conditions:
-      - "#approved-reviews-by>=1"
-      - check-success=gomod
-      - check-success=lint
-      - check-success=test
-      - check-success=build
-      - check-success=docs
-      - check-success=release
-      - label=kueue
-      - label!="hold off merging"
+      - and:
+        - "#approved-reviews-by>=1"
+        - check-success=gomod
+        - check-success=lint
+        - check-success=test (test)
+        - check-success=test (integration-test)
+        - check-success=test (helm-test)
+        - check-success=build (controller)
+        - check-success=build (kanctl)
+        - check-success=build (kando)
+        - check-success=docs
+        - label=kueue
+        - label!="hold off merging"
 
 pull_request_rules:
   - name: Automatic merge
     conditions:
-      - base=master
-      - "#approved-reviews-by>=1"
-      - check-success=gomod
-      - check-success=lint
-      - check-success=test
-      - check-success=build
-      - check-success=docs
-      - check-success=release
-      - label=kueue
-      - label!="hold off merging"
+      - and:
+        - base=master
+        - "#approved-reviews-by>=1"
+        - check-success=gomod
+        - check-success=lint
+        - check-success=test (test)
+        - check-success=test (integration-test)
+        - check-success=test (helm-test)
+        - check-success=build (controller)
+        - check-success=build (kanctl)
+        - check-success=build (kando)
+        - check-success=docs
+        - label=kueue
+        - label!="hold off merging"
     actions:
       queue:
         name: default