From 2516bcf06626fc19bde2fcf976f187a958b37f12 Mon Sep 17 00:00:00 2001
From: Andrei Neagu <5694077+GitHK@users.noreply.github.com>
Date: Tue, 28 Jan 2025 10:05:14 +0100
Subject: [PATCH 1/4] ci(Mergify): configuration update

Signed-off-by: Andrei Neagu <null>
---
 .mergify.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .mergify.yml

diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 000000000000..2e45b6582954
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,17 @@
+pull_request_rules:
+  - name: Automatic merge
+    description: Conditions required for automatic merging of a PR
+    conditions:
+      - label = 🤖-automerge
+      - label != 🤖-do-not-merge
+      - check-success=unit-tests
+      - check-success=integration-tests
+      - check-success=system-tests
+      - "#approved-reviews-by>=2"
+      - "#changes-requested-reviews-by=0"
+      - "#review-threads-unresolved=0"
+      - base=master
+      - -draft
+      - -conflict
+    actions:
+      merge:

From 86642efac31130f73a818dbb3370489075e44386 Mon Sep 17 00:00:00 2001
From: Andrei Neagu <5694077+GitHK@users.noreply.github.com>
Date: Tue, 28 Jan 2025 10:08:41 +0100
Subject: [PATCH 2/4] added notes and moved .github folder

---
 .github/.mergify.yml | 28 ++++++++++++++++++++++++++++
 .mergify.yml         | 17 -----------------
 2 files changed, 28 insertions(+), 17 deletions(-)
 create mode 100644 .github/.mergify.yml
 delete mode 100644 .mergify.yml

diff --git a/.github/.mergify.yml b/.github/.mergify.yml
new file mode 100644
index 000000000000..0014d37bacf0
--- /dev/null
+++ b/.github/.mergify.yml
@@ -0,0 +1,28 @@
+pull_request_rules:
+    - name: Automatic merge
+      description: Conditions required for automatic merging of a PR
+      conditions:
+        # let Mergify know that the PR can be megrged (added manually)
+        - label = 🤖-automerge
+        # block Mergify from merging the PR (added manually)
+        - label != 🤖-do-not-merge
+
+        # list of CI checks that need to pass in order for the PR to be merged
+        - check-success=unit-tests
+        - check-success=integration-tests
+        - check-success=system-tests
+
+        # Check for required reviews
+        - "#approved-reviews-by>=2"  # Requires 2 approving reviews
+        - "#changes-requested-reviews-by=0"  # No changes requested
+        - "#review-threads-unresolved=0"  # All review threads resolved
+
+        # Optional but recommended checks
+        - base=master
+        - -draft  # PR is not in draft state
+        - -conflict  # No merge conflicts
+      actions:
+        merge:
+
+
+
diff --git a/.mergify.yml b/.mergify.yml
deleted file mode 100644
index 2e45b6582954..000000000000
--- a/.mergify.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-pull_request_rules:
-  - name: Automatic merge
-    description: Conditions required for automatic merging of a PR
-    conditions:
-      - label = 🤖-automerge
-      - label != 🤖-do-not-merge
-      - check-success=unit-tests
-      - check-success=integration-tests
-      - check-success=system-tests
-      - "#approved-reviews-by>=2"
-      - "#changes-requested-reviews-by=0"
-      - "#review-threads-unresolved=0"
-      - base=master
-      - -draft
-      - -conflict
-    actions:
-      merge:

From 5fdd81c1a2e4e978299796895f54c841cc505d7c Mon Sep 17 00:00:00 2001
From: Andrei Neagu <5694077+GitHK@users.noreply.github.com>
Date: Tue, 28 Jan 2025 11:23:13 +0100
Subject: [PATCH 3/4] expanded configration

---
 .github/.mergify.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/.mergify.yml b/.github/.mergify.yml
index 0014d37bacf0..bcc433e6ebd0 100644
--- a/.github/.mergify.yml
+++ b/.github/.mergify.yml
@@ -2,7 +2,7 @@ pull_request_rules:
     - name: Automatic merge
       description: Conditions required for automatic merging of a PR
       conditions:
-        # let Mergify know that the PR can be megrged (added manually)
+        # let Mergify know that the PR can be merged (added manually)
         - label = 🤖-automerge
         # block Mergify from merging the PR (added manually)
         - label != 🤖-do-not-merge
@@ -25,4 +25,16 @@ pull_request_rules:
         merge:
 
 
+    - name: retry CI on failure
+      conditions:
+        - base=master
+        - or:
+          - check-failure=unit-tests
+          - check-failure=integration-tests
+          - check-failure=system-tests
+      actions:
+        github_actions:
+          workflow:
+            dispatch:
+            - workflow: .github/workflows/ci-testing-deploy.yml
 

From e433b837bb1f3e177466d071f2e55d3096790f74 Mon Sep 17 00:00:00 2001
From: Andrei Neagu <5694077+GitHK@users.noreply.github.com>
Date: Tue, 28 Jan 2025 12:47:48 +0100
Subject: [PATCH 4/4] rename path

---
 .github/{.mergify.yml => mergify.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/{.mergify.yml => mergify.yml} (100%)

diff --git a/.github/.mergify.yml b/.github/mergify.yml
similarity index 100%
rename from .github/.mergify.yml
rename to .github/mergify.yml