github: update mergify rules to match recent changes to ci matrix

This also adds (back?) missing rules pertaining to the server (non-ad)
tests.

Signed-off-by: John Mulligan <[email protected]>

Author: phlogistonjohn

.github/mergify.yml

@@ -15,23 +15,30 @@ queue_rules:
   - name: default
     conditions:
       - check-success=checks
-      - check-success=build-server (centos, amd64)
-      - check-success=build-server (fedora, amd64)
-      - check-success=build-server (opensuse, amd64)
-      - check-success=build-ad-server (fedora, amd64)
-      - check-success=build-ad-server (opensuse, amd64)
-      - check-success=build-nightly-server (centos, amd64)
-      - check-success=build-nightly-server (fedora, amd64)
-      - check-success=build-nightly-ad-server (fedora, amd64)
+      - check-success=build-server (default, centos, amd64)
+      - check-success=build-server (default, fedora, amd64)
+      - check-success=build-server (default, opensuse, amd64)
+      - check-success=build-server (nightly, centos, amd64)
+      - check-success=build-server (nightly, fedora, amd64)
+      - check-success=build-ad-server (default, fedora, amd64)
+      - check-success=build-ad-server (default, opensuse, amd64)
+      - check-success=build-ad-server (nightly, centos, amd64)
+      - check-success=build-ad-server (nightly, fedora, amd64)
       - check-success=build-client (centos, amd64)
       - check-success=build-client (fedora, amd64)
       - check-success=build-client (opensuse, amd64)
       - check-success=build-toolbox (centos, amd64)
       - check-success=build-toolbox (fedora, amd64)
       - check-success=build-toolbox (opensuse, amd64)
-      - check-success=test-ad-server-kubernetes (fedora, amd64)
-      - check-success=test-ad-server-kubernetes (opensuse, amd64)
-      - check-success=test-nightly-ad-server-kubernetes (fedora, amd64)
+      - check-success=test-server (default, centos, amd64)
+      - check-success=test-server (default, fedora, amd64)
+      - check-success=test-server (default, opensuse, amd64)
+      - check-success=test-server (nightly, centos, amd64)
+      - check-success=test-server (nightly, fedora, amd64)
+      - check-success=test-ad-server-kubernetes (default, fedora, amd64)
+      - check-success=test-ad-server-kubernetes (default, opensuse, amd64)
+      - check-success=test-ad-server-kubernetes (nightly, centos, amd64)
+      - check-success=test-ad-server-kubernetes (nightly, fedora, amd64)
       - check-success=dpulls
 
 
@@ -48,23 +55,30 @@ pull_request_rules:
   - name: Automatic merge on approval
     conditions:
       - check-success=checks
-      - check-success=build-server (centos, amd64)
-      - check-success=build-server (fedora, amd64)
-      - check-success=build-server (opensuse, amd64)
-      - check-success=build-ad-server (fedora, amd64)
-      - check-success=build-ad-server (opensuse, amd64)
-      - check-success=build-nightly-server (centos, amd64)
-      - check-success=build-nightly-server (fedora, amd64)
-      - check-success=build-nightly-ad-server (fedora, amd64)
+      - check-success=build-server (default, centos, amd64)
+      - check-success=build-server (default, fedora, amd64)
+      - check-success=build-server (default, opensuse, amd64)
+      - check-success=build-server (nightly, centos, amd64)
+      - check-success=build-server (nightly, fedora, amd64)
+      - check-success=build-ad-server (default, fedora, amd64)
+      - check-success=build-ad-server (default, opensuse, amd64)
+      - check-success=build-ad-server (nightly, centos, amd64)
+      - check-success=build-ad-server (nightly, fedora, amd64)
       - check-success=build-client (centos, amd64)
       - check-success=build-client (fedora, amd64)
       - check-success=build-client (opensuse, amd64)
       - check-success=build-toolbox (centos, amd64)
       - check-success=build-toolbox (fedora, amd64)
       - check-success=build-toolbox (opensuse, amd64)
-      - check-success=test-ad-server-kubernetes (fedora, amd64)
-      - check-success=test-ad-server-kubernetes (opensuse, amd64)
-      - check-success=test-nightly-ad-server-kubernetes (fedora, amd64)
+      - check-success=test-server (default, centos, amd64)
+      - check-success=test-server (default, fedora, amd64)
+      - check-success=test-server (default, opensuse, amd64)
+      - check-success=test-server (nightly, centos, amd64)
+      - check-success=test-server (nightly, fedora, amd64)
+      - check-success=test-ad-server-kubernetes (default, fedora, amd64)
+      - check-success=test-ad-server-kubernetes (default, opensuse, amd64)
+      - check-success=test-ad-server-kubernetes (nightly, centos, amd64)
+      - check-success=test-ad-server-kubernetes (nightly, fedora, amd64)
       - check-success=dpulls
       - "-draft"
       # Contributors should set the 'do-not-merge' label if they don't want