Merge branch 'use-renovate-branch-automergetype' into 'main'

Use 'branch' auto merge type in renovate's configuration

Closes #62

See merge request fedora/bootc/base-images!224
This commit is contained in:
Colin Walters 2025-06-29 12:43:20 +00:00
commit 10f6ba2f73
17 changed files with 258 additions and 73 deletions

View file

@ -8,12 +8,23 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/cancel-in-progress: "true"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
== "main" && ( "./iot.yaml".pathChanged() || "./iot/***".pathChanged()
|| "./minimal-plus.hidden.yaml".pathChanged() || "./minimal-plus/***".pathChanged()
|| "./minimal.yaml".pathChanged() || "./minimal/***".pathChanged() ||
"./fedora-includes/generic.yaml".pathChanged() || ".tekton/fedora-bootc-42-iot-pull-request.yaml".pathChanged()
|| "Containerfile".pathChanged() )
pipelinesascode.tekton.dev/on-cel-expression: |
event == "pull_request" &&
(
target_branch == "main"
) && (
".tekton/fedora-bootc-42-iot-pull-request.yaml".pathChanged() ||
"Containerfile".pathChanged() ||
"bootc-base-imagectl".pathChanged() ||
"install-manifests".pathChanged() ||
"fedora-includes/generic.yaml".pathChanged() ||
"minimal.yaml".pathChanged() ||
"minimal/***".pathChanged() ||
"minimal-plus.hidden.yaml".pathChanged()
"minimal-plus/***".pathChanged() ||
"iot.yaml".pathChanged() ||
"iot/***".pathChanged()
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: fedora-bootc-42

View file

@ -7,12 +7,24 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/cancel-in-progress: "false"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
== "main" && ( "./iot.yaml".pathChanged() || "./iot/***".pathChanged()
|| "./minimal-plus.hidden.yaml".pathChanged() || "./minimal-plus/***".pathChanged()
|| "./minimal.yaml".pathChanged() || "./minimal/***".pathChanged() ||
"./fedora-includes/generic.yaml".pathChanged() || ".tekton/fedora-bootc-42-iot-push.yaml".pathChanged()
|| "Containerfile".pathChanged() )
pipelinesascode.tekton.dev/on-cel-expression: |
event == "push" &&
(
target_branch.matches("renovate/.*") ||
target_branch == "main"
) && (
".tekton/fedora-bootc-42-iot-push.yaml".pathChanged() ||
"Containerfile".pathChanged() ||
"bootc-base-imagectl".pathChanged() ||
"install-manifests".pathChanged() ||
"fedora-includes/generic.yaml".pathChanged() ||
"minimal.yaml".pathChanged() ||
"minimal/***".pathChanged() ||
"minimal-plus.hidden.yaml".pathChanged() ||
"minimal-plus/***".pathChanged() ||
"iot.yaml".pathChanged() ||
"iot/***".pathChanged()
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: fedora-bootc-42

View file

@ -8,10 +8,21 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/cancel-in-progress: "true"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
== "main" && ( "./minimal-plus.hidden.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./minimal-plus/***".pathChanged() || ".tekton/fedora-bootc-42-minimal-plus-pull-request.yaml".pathChanged()
|| "Containerfile".pathChanged() )
pipelinesascode.tekton.dev/on-cel-expression: |
event == "pull_request" &&
(
target_branch == "main"
) && (
".tekton/fedora-bootc-42-minimal-plus-pull-request.yaml".pathChanged() ||
"Containerfile".pathChanged() ||
"bootc-base-imagectl".pathChanged() ||
"install-manifests".pathChanged() ||
"fedora-includes/generic.yaml".pathChanged() ||
"minimal.yaml".pathChanged() ||
"minimal/***".pathChanged() ||
"minimal-plus.hidden.yaml".pathChanged() ||
"minimal-plus/***".pathChanged()
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: fedora-bootc-42

View file

@ -7,10 +7,22 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/cancel-in-progress: "false"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
== "main" && ( "./minimal-plus.hidden.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./minimal-plus/***".pathChanged() || ".tekton/fedora-bootc-42-minimal-plus-push.yaml".pathChanged()
|| "Containerfile".pathChanged() )
pipelinesascode.tekton.dev/on-cel-expression: |
event == "push" &&
(
target_branch.matches("renovate/.*") ||
target_branch == "main"
) && (
".tekton/fedora-bootc-42-minimal-plus-push.yaml".pathChanged() ||
"Containerfile".pathChanged() ||
"bootc-base-imagectl".pathChanged() ||
"install-manifests".pathChanged() ||
"fedora-includes/generic.yaml".pathChanged() ||
"minimal.yaml".pathChanged() ||
"minimal/***".pathChanged() ||
"minimal-plus.hidden.yaml".pathChanged() ||
"minimal-plus/***".pathChanged()
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: fedora-bootc-42

View file

@ -8,10 +8,19 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/cancel-in-progress: "true"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
== "main" && ( "./minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./minimal/***".pathChanged() || ".tekton/fedora-bootc-42-minimal-pull-request.yaml".pathChanged()
|| "Containerfile".pathChanged() )
pipelinesascode.tekton.dev/on-cel-expression: |
event == "pull_request" &&
(
target_branch == "main"
) && (
".tekton/fedora-bootc-42-minimal-pull-request.yaml".pathChanged() ||
"Containerfile".pathChanged() ||
"bootc-base-imagectl".pathChanged() ||
"install-manifests".pathChanged() ||
"fedora-includes/generic.yaml".pathChanged() ||
"minimal.yaml".pathChanged() ||
"minimal/***".pathChanged()
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: fedora-bootc-42

View file

@ -7,10 +7,20 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/cancel-in-progress: "false"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
== "main" && ( "./minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./minimal/***".pathChanged() || ".tekton/fedora-bootc-42-minimal-push.yaml".pathChanged()
|| "Containerfile".pathChanged() )
pipelinesascode.tekton.dev/on-cel-expression: |
event == "push" &&
(
target_branch.matches("renovate/.*") ||
target_branch == "main"
) && (
".tekton/fedora-bootc-42-minimal-push.yaml".pathChanged() ||
"Containerfile".pathChanged() ||
"bootc-base-imagectl".pathChanged() ||
"install-manifests".pathChanged() ||
"fedora-includes/generic.yaml".pathChanged() ||
"minimal.yaml".pathChanged() ||
"minimal/***".pathChanged()
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: fedora-bootc-42

View file

@ -8,10 +8,23 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/cancel-in-progress: "true"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
== "main" && ( "./standard.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./standard/***".pathChanged() || ".tekton/fedora-bootc-42-standard-pull-request.yaml".pathChanged()
|| "Containerfile".pathChanged() )
pipelinesascode.tekton.dev/on-cel-expression: |
event == "pull_request" &&
(
target_branch == "main"
) && (
".tekton/fedora-bootc-42-standard-pull-request.yaml".pathChanged() ||
"Containerfile".pathChanged() ||
"bootc-base-imagectl".pathChanged() ||
"install-manifests".pathChanged() ||
"fedora-includes/generic.yaml".pathChanged() ||
"minimal.yaml".pathChanged() ||
"minimal/***".pathChanged() ||
"minimal-plus.hidden.yaml".pathChanged() ||
"minimal-plus/***".pathChanged() ||
"standard.yaml".pathChanged() ||
"standard/***".pathChanged()
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: fedora-bootc-42

View file

@ -7,10 +7,24 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/cancel-in-progress: "false"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
== "main" && ( "./standard.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./standard/***".pathChanged() || ".tekton/fedora-bootc-42-standard-push.yaml".pathChanged()
|| "Containerfile".pathChanged() )
pipelinesascode.tekton.dev/on-cel-expression: |
event == "push" &&
(
target_branch.matches("renovate/.*") ||
target_branch == "main"
) && (
".tekton/fedora-bootc-42-standard-push.yaml".pathChanged() ||
"Containerfile".pathChanged() ||
"bootc-base-imagectl".pathChanged() ||
"install-manifests".pathChanged() ||
"fedora-includes/generic.yaml".pathChanged() ||
"minimal.yaml".pathChanged() ||
"minimal/***".pathChanged() ||
"minimal-plus.hidden.yaml".pathChanged() ||
"minimal-plus/***".pathChanged() ||
"standard.yaml".pathChanged() ||
"standard/***".pathChanged()
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: fedora-bootc-42

View file

@ -8,12 +8,23 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/cancel-in-progress: "true"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
== "main" && ( "./iot.yaml".pathChanged() || "./iot/***".pathChanged()
|| "./minimal-plus.hidden.yaml".pathChanged() || "./minimal-plus/***".pathChanged()
|| "./minimal.yaml".pathChanged() || "./minimal/***".pathChanged() ||
"./fedora-includes/generic.yaml".pathChanged() || ".tekton/fedora-bootc-rawhide-iot-pull-request.yaml".pathChanged()
|| "Containerfile".pathChanged() )
pipelinesascode.tekton.dev/on-cel-expression: |
event == "pull_request" &&
(
target_branch == "main"
) && (
".tekton/fedora-bootc-rawhide-iot-pull-request.yaml".pathChanged() ||
"Containerfile".pathChanged() ||
"bootc-base-imagectl".pathChanged() ||
"install-manifests".pathChanged() ||
"fedora-includes/generic.yaml".pathChanged() ||
"minimal.yaml".pathChanged() ||
"minimal/***".pathChanged() ||
"minimal-plus.hidden.yaml".pathChanged() ||
"minimal-plus/***".pathChanged() ||
"iot.yaml".pathChanged() ||
"iot/***".pathChanged()
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: fedora-bootc-rawhide

View file

@ -7,12 +7,24 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/cancel-in-progress: "false"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
== "main" && ( "./iot.yaml".pathChanged() || "./iot/***".pathChanged()
|| "./minimal-plus.hidden.yaml".pathChanged() || "./minimal-plus/***".pathChanged()
|| "./minimal.yaml".pathChanged() || "./minimal/***".pathChanged() ||
"./fedora-includes/generic.yaml".pathChanged() || ".tekton/fedora-bootc-rawhide-iot-push.yaml".pathChanged()
|| "Containerfile".pathChanged() )
pipelinesascode.tekton.dev/on-cel-expression: |
event == "push" &&
(
target_branch.matches("renovate/.*") ||
target_branch == "main"
) && (
".tekton/fedora-bootc-rawhide-iot-push.yaml".pathChanged() ||
"Containerfile".pathChanged() ||
"bootc-base-imagectl".pathChanged() ||
"install-manifests".pathChanged() ||
"fedora-includes/generic.yaml".pathChanged() ||
"minimal.yaml".pathChanged() ||
"minimal/***".pathChanged() ||
"minimal-plus.hidden.yaml".pathChanged() ||
"minimal-plus/***".pathChanged() ||
"iot.yaml".pathChanged() ||
"iot/***".pathChanged()
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: fedora-bootc-rawhide

View file

@ -8,10 +8,21 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/cancel-in-progress: "true"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
== "main" && ( "./minimal-plus.hidden.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./minimal-plus/***".pathChanged() || ".tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml".pathChanged()
|| "Containerfile".pathChanged() )
pipelinesascode.tekton.dev/on-cel-expression: |
event == "pull_request" &&
(
target_branch == "main"
) && (
".tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml".pathChanged() ||
"Containerfile".pathChanged() ||
"bootc-base-imagectl".pathChanged() ||
"install-manifests".pathChanged() ||
"fedora-includes/generic.yaml".pathChanged() ||
"minimal.yaml".pathChanged() ||
"minimal/***".pathChanged() ||
"minimal-plus.hidden.yaml".pathChanged() ||
"minimal-plus/***".pathChanged()
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: fedora-bootc-rawhide

View file

@ -7,10 +7,22 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/cancel-in-progress: "false"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
== "main" && ( "./minimal-plus.hidden.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./minimal-plus/***".pathChanged() || ".tekton/fedora-bootc-rawhide-minimal-plus-push.yaml".pathChanged()
|| "Containerfile".pathChanged() )
pipelinesascode.tekton.dev/on-cel-expression: |
event == "push" &&
(
target_branch.matches("renovate/.*") ||
target_branch == "main"
) && (
".tekton/fedora-bootc-rawhide-minimal-plus-push.yaml".pathChanged() ||
"Containerfile".pathChanged() ||
"bootc-base-imagectl".pathChanged() ||
"install-manifests".pathChanged() ||
"fedora-includes/generic.yaml".pathChanged() ||
"minimal.yaml".pathChanged() ||
"minimal/***".pathChanged() ||
"minimal-plus.hidden.yaml".pathChanged() ||
"minimal-plus/***".pathChanged()
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: fedora-bootc-rawhide

View file

@ -8,10 +8,19 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/cancel-in-progress: "true"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
== "main" && ( "./minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./minimal/***".pathChanged() || ".tekton/fedora-bootc-rawhide-minimal-pull-request.yaml".pathChanged()
|| "Containerfile".pathChanged() )
pipelinesascode.tekton.dev/on-cel-expression: |
event == "pull_request" &&
(
target_branch == "main"
) && (
".tekton/fedora-bootc-rawhide-minimal-pull-request.yaml".pathChanged() ||
"Containerfile".pathChanged() ||
"bootc-base-imagectl".pathChanged() ||
"install-manifests".pathChanged() ||
"fedora-includes/generic.yaml".pathChanged() ||
"minimal.yaml".pathChanged() ||
"minimal/***".pathChanged()
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: fedora-bootc-rawhide

View file

@ -7,10 +7,20 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/cancel-in-progress: "false"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
== "main" && ( "./minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./minimal/***".pathChanged() || ".tekton/fedora-bootc-rawhide-minimal-push.yaml".pathChanged()
|| "Containerfile".pathChanged() )
pipelinesascode.tekton.dev/on-cel-expression: |
event == "push" &&
(
target_branch.matches("renovate/.*") ||
target_branch == "main"
) && (
".tekton/fedora-bootc-rawhide-minimal-push.yaml".pathChanged() ||
"Containerfile".pathChanged() ||
"bootc-base-imagectl".pathChanged() ||
"install-manifests".pathChanged() ||
"fedora-includes/generic.yaml".pathChanged() ||
"minimal.yaml".pathChanged() ||
"minimal/***".pathChanged()
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: fedora-bootc-rawhide

View file

@ -8,10 +8,23 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/cancel-in-progress: "true"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
== "main" && ( "./standard.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./standard/***".pathChanged() || ".tekton/fedora-bootc-rawhide-standard-pull-request.yaml".pathChanged()
|| "Containerfile".pathChanged() )
pipelinesascode.tekton.dev/on-cel-expression: |
event == "pull_request" &&
(
target_branch == "main"
) && (
".tekton/fedora-bootc-rawhide-standard-pull-request.yaml".pathChanged() ||
"Containerfile".pathChanged() ||
"bootc-base-imagectl".pathChanged() ||
"install-manifests".pathChanged() ||
"fedora-includes/generic.yaml".pathChanged() ||
"minimal.yaml".pathChanged() ||
"minimal/***".pathChanged() ||
"minimal-plus.hidden.yaml".pathChanged() ||
"minimal-plus/***".pathChanged() ||
"standard.yaml".pathChanged() ||
"standard/***".pathChanged()
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: fedora-bootc-rawhide

View file

@ -7,10 +7,24 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/cancel-in-progress: "false"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
== "main" && ( "./standard.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./standard/***".pathChanged() || ".tekton/fedora-bootc-rawhide-standard-push.yaml".pathChanged()
|| "Containerfile".pathChanged() )
pipelinesascode.tekton.dev/on-cel-expression: |
event == "push" &&
(
target_branch.matches("renovate/.*") ||
target_branch == "main"
) && (
".tekton/fedora-bootc-rawhide-standard-push.yaml".pathChanged() ||
"Containerfile".pathChanged() ||
"bootc-base-imagectl".pathChanged() ||
"install-manifests".pathChanged() ||
"fedora-includes/generic.yaml".pathChanged() ||
"minimal.yaml".pathChanged() ||
"minimal/***".pathChanged() ||
"minimal-plus.hidden.yaml".pathChanged() ||
"minimal-plus/***".pathChanged() ||
"standard.yaml".pathChanged() ||
"standard/***".pathChanged()
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: fedora-bootc-rawhide

View file

@ -4,6 +4,7 @@
"github>platform-engineering-org/.github"
],
"dependencyDashboard": true,
"automergeType": "branch",
"tekton": {
"additionalBranchPrefix": "",
"includePaths": [
@ -19,7 +20,7 @@
],
"enabled": true,
"groupName": "Konflux references",
"branchPrefix": "konflux/references/",
"branchPrefix": "renovate/konflux/references/",
"group": {
"branchTopic": "{{{baseBranch}}}",
"commitMessageTopic": "{{{groupName}}}"