diff --git a/.github/mergify.yml b/.github/mergify.yml index 633b447a9907..fd77f8a8f332 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -22,48 +22,3 @@ queue_rules: - check-success=unit-tests - check-success=integration-tests - check-success=system-tests - - -pull_request_rules: - - name: retry flaky tests (when PR is approved) - conditions: - - label=🤖-automerge - - label!=🤖-do-not-merge - - base=master - - - -draft # PR is not in draft state - - -conflict # No merge conflicts - - "#approved-reviews-by>=2" # Requires 2 approving reviews - - "#changes-requested-reviews-by=0" # No changes requested - - "#review-threads-unresolved=0" # All review threads resolved - - - or: - - check-failure=system-test-environment-setup - - check-failure=changes - - check-failure=build-test-images - - check-failure=build-test-images-frontend - - check-failure=unit-tests - - check-failure=integration-tests - - check-failure=system-tests - actions: - comment: - message: "Restarted CI due to failing tests" - github_actions: - workflow: - dispatch: - - workflow: ci-testing-deploy.yml - - - name: Automatically add PR to queue if it meets conditions - conditions: - - "label=🤖-automerge" - - "label!=🤖-do-not-merge" - - "base=master" - - - "-draft" # PR is not in draft state - - "-conflict" # PR has no conflicts - - "#approved-reviews-by>=2" # Requires 2 approvals - - "#changes-requested-reviews-by=0" # No requested changes - - "#review-threads-unresolved=0" # All review threads resolved - actions: - queue: - name: default