From f86b05c2dd0d6865a50cd890bda21c3f3341d769 Mon Sep 17 00:00:00 2001
From: Praveen M <m.praveen@ibm.com>
Date: Wed, 4 Mar 2026 16:10:48 +0530
Subject: [PATCH 1/2] ci: fix the e2e action name

Signed-off-by: Praveen M <m.praveen@ibm.com>
---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fbda58cd..b75610cd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ permissions:
   contents: read
 jobs:
   test-e2e:
-    name: Run on Ubuntu
+    name: e2e
     runs-on: ubuntu-latest
     steps:
       - name: Clone the code

From 862a6162bc5bc23bc4f0a061d79bd526b6c57ade Mon Sep 17 00:00:00 2001
From: Praveen M <m.praveen@ibm.com>
Date: Wed, 4 Mar 2026 16:11:09 +0530
Subject: [PATCH 2/2] ci: setup mergifyio

Signed-off-by: Praveen M <m.praveen@ibm.com>
---
 .mergify.yml | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 .mergify.yml

diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 00000000..2f618ab2
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,46 @@
+---
+queue_rules:
+  - name: default
+    merge_method: rebase
+    update_method: rebase
+    batch_size: 1
+    autoqueue: true
+    queue_conditions:
+      - check-success = DCO
+      - "check-success=build_bundle"
+      - "check-success=build_operator"
+      - "check-success=build_mover"
+      - "check-success=e2e"
+      - "check-success=codespell"
+      - "check-success=golangci-lint"
+      - "check-success=govulncheck"
+      - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
+
+merge_queue:
+  max_parallel_checks: 1
+
+pull_request_rules:
+  - name: Dismiss reviews on update
+    conditions: []
+    actions:
+      dismiss_reviews:
+        approved: true
+        changes_requested: true
+
+  - name: Ask to resolve conflict
+    conditions:
+      - conflict
+    actions:
+      comment:
+        message: "@{{author}}, this pull request has merge conflicts. Please resolve them before it can be merged."
+
+  - name: Ask to sign commits with DCO
+    conditions:
+      - -closed
+      - -merged
+      - "check-failure=DCO"
+    actions:
+      comment:
+        message: |
+          @{{author}}, your commits are missing the `Signed-off-by` line required by the DCO.