Fix autorebase and add/remove checks in automerge label

Signed-off-by: Shalier Xia <[email protected]>

.mergify.yml

@@ -19,6 +19,7 @@ pull_request_rules:
       - "check-success=Go test e2e (4)"
       - "check-success=DCO"
       - "check-success=netlify/osm-docs/deploy-preview"
+      - "check-success=DCO"
       # True if the PR has at least 2 approving reviews
       - "#approved-reviews-by>=2"
       # True if the PR has the automerge label
@@ -57,6 +58,7 @@ pull_request_rules:
       - "check-success=Go test e2e (4)"
       - "check-success=DCO"
       - "check-success=netlify/osm-docs/deploy-preview"
+      - "check-success=DCO"
       # True if the PR has at least 2 approving reviews
       - "#approved-reviews-by>=2"
       # True if the PR has the automerge label
@@ -96,6 +98,7 @@ pull_request_rules:
       - "check-success=Go test e2e (4)"
       - "check-success=DCO"
       - "check-success=netlify/osm-docs/deploy-preview"
+      - "check-success=DCO"
       # True if the PR has at least 2 approving reviews
       - "#approved-reviews-by>=2"
       # True if the PR has the automerge label
@@ -124,6 +127,4 @@ pull_request_rules:
       - -draft
     actions:
       rebase:
-        # bot_account is the account the rebase will be done under
-        # if not specified Mergify will use any user in OSM that's logged into Mergify
-        bot_account: OSM-PR-bot
+        # Mergify will use any user in OSM that's logged into Mergify