From aabbd950b63d489e869365c46f0ef8cbbb70a0a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Mart=C3=ADn?= <mmartinv@redhat.com>
Date: Fri, 27 Jun 2025 14:11:29 +0200
Subject: [PATCH] Use the 'branch' auto merge type in renovate's configuration.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of crating MRs, renovate will:

- Create the branch, wait for test results
- Rebase it any time it gets out of date with the base branch
- Automerge the branch commit if it's:
    (a) up-to-date with the base branch, and
    (b) passing all tests
- As a backup, raise a PR only if either:
    (a) tests fail, or
    (b) tests remain pending for too long (default: 24 hours)

Resolves #62

Signed-off-by: Miguel Martín <mmartinv@redhat.com>
---
 .tekton/fedora-bootc-42-iot-push.yaml               | 1 +
 .tekton/fedora-bootc-42-minimal-plus-push.yaml      | 1 +
 .tekton/fedora-bootc-42-minimal-push.yaml           | 1 +
 .tekton/fedora-bootc-42-standard-push.yaml          | 1 +
 .tekton/fedora-bootc-rawhide-iot-push.yaml          | 1 +
 .tekton/fedora-bootc-rawhide-minimal-plus-push.yaml | 1 +
 .tekton/fedora-bootc-rawhide-minimal-push.yaml      | 1 +
 .tekton/fedora-bootc-rawhide-standard-push.yaml     | 1 +
 renovate.json                                       | 1 +
 9 files changed, 9 insertions(+)

diff --git a/.tekton/fedora-bootc-42-iot-push.yaml b/.tekton/fedora-bootc-42-iot-push.yaml
index 0de8c1a..87f0728 100644
--- a/.tekton/fedora-bootc-42-iot-push.yaml
+++ b/.tekton/fedora-bootc-42-iot-push.yaml
@@ -10,6 +10,7 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "push" &&
       (
+        target_branch.matches("renovate/.*") ||
         target_branch == "main"
       ) && (
         ".tekton/fedora-bootc-42-iot-push.yaml".pathChanged() ||
diff --git a/.tekton/fedora-bootc-42-minimal-plus-push.yaml b/.tekton/fedora-bootc-42-minimal-plus-push.yaml
index 59b3bd9..95d15a8 100644
--- a/.tekton/fedora-bootc-42-minimal-plus-push.yaml
+++ b/.tekton/fedora-bootc-42-minimal-plus-push.yaml
@@ -10,6 +10,7 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "push" &&
       (
+        target_branch.matches("renovate/.*") ||
         target_branch == "main"
       ) && (
         ".tekton/fedora-bootc-42-minimal-plus-push.yaml".pathChanged() ||
diff --git a/.tekton/fedora-bootc-42-minimal-push.yaml b/.tekton/fedora-bootc-42-minimal-push.yaml
index 545d4ec..0eb5902 100644
--- a/.tekton/fedora-bootc-42-minimal-push.yaml
+++ b/.tekton/fedora-bootc-42-minimal-push.yaml
@@ -10,6 +10,7 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "push" &&
       (
+        target_branch.matches("renovate/.*") ||
         target_branch == "main"
       ) && (
         ".tekton/fedora-bootc-42-minimal-push.yaml".pathChanged() ||
diff --git a/.tekton/fedora-bootc-42-standard-push.yaml b/.tekton/fedora-bootc-42-standard-push.yaml
index 4592738..bcb79a3 100644
--- a/.tekton/fedora-bootc-42-standard-push.yaml
+++ b/.tekton/fedora-bootc-42-standard-push.yaml
@@ -10,6 +10,7 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "push" &&
       (
+        target_branch.matches("renovate/.*") ||
         target_branch == "main"
       ) && (
         ".tekton/fedora-bootc-42-standard-push.yaml".pathChanged() ||
diff --git a/.tekton/fedora-bootc-rawhide-iot-push.yaml b/.tekton/fedora-bootc-rawhide-iot-push.yaml
index edcee18..befcdc5 100644
--- a/.tekton/fedora-bootc-rawhide-iot-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-iot-push.yaml
@@ -10,6 +10,7 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "push" &&
       (
+        target_branch.matches("renovate/.*") ||
         target_branch == "main"
       ) && (
         ".tekton/fedora-bootc-rawhide-iot-push.yaml".pathChanged() ||
diff --git a/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml b/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml
index 0b39ba7..d9df794 100644
--- a/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml
@@ -10,6 +10,7 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "push" &&
       (
+        target_branch.matches("renovate/.*") ||
         target_branch == "main"
       ) && (
         ".tekton/fedora-bootc-rawhide-minimal-plus-push.yaml".pathChanged() ||
diff --git a/.tekton/fedora-bootc-rawhide-minimal-push.yaml b/.tekton/fedora-bootc-rawhide-minimal-push.yaml
index 292513c..585533e 100644
--- a/.tekton/fedora-bootc-rawhide-minimal-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-minimal-push.yaml
@@ -10,6 +10,7 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "push" &&
       (
+        target_branch.matches("renovate/.*") ||
         target_branch == "main"
       ) && (
         ".tekton/fedora-bootc-rawhide-minimal-push.yaml".pathChanged() ||
diff --git a/.tekton/fedora-bootc-rawhide-standard-push.yaml b/.tekton/fedora-bootc-rawhide-standard-push.yaml
index 9340924..137e8e3 100644
--- a/.tekton/fedora-bootc-rawhide-standard-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-standard-push.yaml
@@ -10,6 +10,7 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "push" &&
       (
+        target_branch.matches("renovate/.*") ||
         target_branch == "main"
       ) && (
         ".tekton/fedora-bootc-rawhide-standard-push.yaml".pathChanged() ||
diff --git a/renovate.json b/renovate.json
index 3b7b9cd..a7818c4 100644
--- a/renovate.json
+++ b/renovate.json
@@ -4,6 +4,7 @@
     "github>platform-engineering-org/.github"
   ],
   "dependencyDashboard": true,
+  "automergeType": "branch",
   "tekton": {
     "additionalBranchPrefix": "",
     "includePaths": [