From 172a01a6a704bc97ccbb3292c4b12dc1f2ab52e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Mart=C3=ADn?= Date: Fri, 27 Jun 2025 14:00:19 +0200 Subject: [PATCH 1/4] Make 'on-cel-expression' more readable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Martín --- .tekton/fedora-bootc-42-iot-pull-request.yaml | 21 +++++++++++++------ .tekton/fedora-bootc-42-iot-push.yaml | 21 +++++++++++++------ ...ra-bootc-42-minimal-plus-pull-request.yaml | 17 +++++++++++---- .../fedora-bootc-42-minimal-plus-push.yaml | 17 +++++++++++---- .../fedora-bootc-42-minimal-pull-request.yaml | 15 +++++++++---- .tekton/fedora-bootc-42-minimal-push.yaml | 15 +++++++++---- ...fedora-bootc-42-standard-pull-request.yaml | 14 +++++++++---- .tekton/fedora-bootc-42-standard-push.yaml | 15 +++++++++---- ...fedora-bootc-rawhide-iot-pull-request.yaml | 21 +++++++++++++------ .tekton/fedora-bootc-rawhide-iot-push.yaml | 21 +++++++++++++------ ...otc-rawhide-minimal-plus-pull-request.yaml | 17 +++++++++++---- ...edora-bootc-rawhide-minimal-plus-push.yaml | 17 +++++++++++---- ...ra-bootc-rawhide-minimal-pull-request.yaml | 15 +++++++++---- .../fedora-bootc-rawhide-minimal-push.yaml | 15 +++++++++---- ...a-bootc-rawhide-standard-pull-request.yaml | 15 +++++++++---- .../fedora-bootc-rawhide-standard-push.yaml | 15 +++++++++---- 16 files changed, 199 insertions(+), 72 deletions(-) diff --git a/.tekton/fedora-bootc-42-iot-pull-request.yaml b/.tekton/fedora-bootc-42-iot-pull-request.yaml index 397c385..75032e1 100644 --- a/.tekton/fedora-bootc-42-iot-pull-request.yaml +++ b/.tekton/fedora-bootc-42-iot-pull-request.yaml @@ -8,12 +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" && ( "./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() || + "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 diff --git a/.tekton/fedora-bootc-42-iot-push.yaml b/.tekton/fedora-bootc-42-iot-push.yaml index 8072475..b7f4fcc 100644 --- a/.tekton/fedora-bootc-42-iot-push.yaml +++ b/.tekton/fedora-bootc-42-iot-push.yaml @@ -7,12 +7,21 @@ 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 == "main" + ) && ( + ".tekton/fedora-bootc-42-iot-push.yaml".pathChanged() || + "Containerfile".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 diff --git a/.tekton/fedora-bootc-42-minimal-plus-pull-request.yaml b/.tekton/fedora-bootc-42-minimal-plus-pull-request.yaml index 683e297..25b51d4 100644 --- a/.tekton/fedora-bootc-42-minimal-plus-pull-request.yaml +++ b/.tekton/fedora-bootc-42-minimal-plus-pull-request.yaml @@ -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-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() || + "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 diff --git a/.tekton/fedora-bootc-42-minimal-plus-push.yaml b/.tekton/fedora-bootc-42-minimal-plus-push.yaml index aaee2e3..cbb94a4 100644 --- a/.tekton/fedora-bootc-42-minimal-plus-push.yaml +++ b/.tekton/fedora-bootc-42-minimal-plus-push.yaml @@ -7,10 +7,19 @@ 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 == "main" + ) && ( + ".tekton/fedora-bootc-42-minimal-plus-push.yaml".pathChanged() || + "Containerfile".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 diff --git a/.tekton/fedora-bootc-42-minimal-pull-request.yaml b/.tekton/fedora-bootc-42-minimal-pull-request.yaml index b77e9a2..a735715 100644 --- a/.tekton/fedora-bootc-42-minimal-pull-request.yaml +++ b/.tekton/fedora-bootc-42-minimal-pull-request.yaml @@ -8,10 +8,17 @@ 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() || + "fedora-includes/generic.yaml".pathChanged() || + "minimal.yaml".pathChanged() || + "minimal/***".pathChanged() + ) creationTimestamp: null labels: appstudio.openshift.io/application: fedora-bootc-42 diff --git a/.tekton/fedora-bootc-42-minimal-push.yaml b/.tekton/fedora-bootc-42-minimal-push.yaml index bd3bd82..144daaa 100644 --- a/.tekton/fedora-bootc-42-minimal-push.yaml +++ b/.tekton/fedora-bootc-42-minimal-push.yaml @@ -7,10 +7,17 @@ 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 == "main" + ) && ( + ".tekton/fedora-bootc-42-minimal-push.yaml".pathChanged() || + "Containerfile".pathChanged() || + "fedora-includes/generic.yaml".pathChanged() || + "minimal.yaml".pathChanged() || + "minimal/***".pathChanged() + ) creationTimestamp: null labels: appstudio.openshift.io/application: fedora-bootc-42 diff --git a/.tekton/fedora-bootc-42-standard-pull-request.yaml b/.tekton/fedora-bootc-42-standard-pull-request.yaml index e729de1..4b8ef8a 100644 --- a/.tekton/fedora-bootc-42-standard-pull-request.yaml +++ b/.tekton/fedora-bootc-42-standard-pull-request.yaml @@ -8,10 +8,16 @@ 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() || + "fedora-includes/generic.yaml".pathChanged() || + "standard.yaml".pathChanged() || + "standard/***".pathChanged() creationTimestamp: null labels: appstudio.openshift.io/application: fedora-bootc-42 diff --git a/.tekton/fedora-bootc-42-standard-push.yaml b/.tekton/fedora-bootc-42-standard-push.yaml index bbe4a78..cc2faaa 100644 --- a/.tekton/fedora-bootc-42-standard-push.yaml +++ b/.tekton/fedora-bootc-42-standard-push.yaml @@ -7,10 +7,17 @@ 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 == "main" + ) && ( + ".tekton/fedora-bootc-42-standard-push.yaml".pathChanged() || + "Containerfile".pathChanged() || + "fedora-includes/generic.yaml".pathChanged() || + "standard.yaml".pathChanged() || + "standard/***".pathChanged() + ) creationTimestamp: null labels: appstudio.openshift.io/application: fedora-bootc-42 diff --git a/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml b/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml index aa06a66..03f6234 100644 --- a/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml +++ b/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml @@ -8,12 +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" && ( "./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() || + "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 diff --git a/.tekton/fedora-bootc-rawhide-iot-push.yaml b/.tekton/fedora-bootc-rawhide-iot-push.yaml index a8a84f0..e6489d6 100644 --- a/.tekton/fedora-bootc-rawhide-iot-push.yaml +++ b/.tekton/fedora-bootc-rawhide-iot-push.yaml @@ -7,12 +7,21 @@ 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 == "main" + ) && ( + ".tekton/fedora-bootc-rawhide-iot-push.yaml".pathChanged() || + "Containerfile".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 diff --git a/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml b/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml index 8b66b8c..e03eb54 100644 --- a/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml +++ b/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml @@ -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-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() || + "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 diff --git a/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml b/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml index 6712b5d..38dce5e 100644 --- a/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml +++ b/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml @@ -7,10 +7,19 @@ 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 == "main" + ) && ( + ".tekton/fedora-bootc-rawhide-minimal-plus-push.yaml".pathChanged() || + "Containerfile".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 diff --git a/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml b/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml index e3777da..ba3fe8a 100644 --- a/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml +++ b/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml @@ -8,10 +8,17 @@ 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() || + "fedora-includes/generic.yaml".pathChanged() || + "minimal.yaml".pathChanged() || + "minimal/***".pathChanged() + ) creationTimestamp: null labels: appstudio.openshift.io/application: fedora-bootc-rawhide diff --git a/.tekton/fedora-bootc-rawhide-minimal-push.yaml b/.tekton/fedora-bootc-rawhide-minimal-push.yaml index 7212d47..0bc921e 100644 --- a/.tekton/fedora-bootc-rawhide-minimal-push.yaml +++ b/.tekton/fedora-bootc-rawhide-minimal-push.yaml @@ -7,10 +7,17 @@ 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 == "main" + ) && ( + ".tekton/fedora-bootc-rawhide-minimal-push.yaml".pathChanged() || + "Containerfile".pathChanged() || + "fedora-includes/generic.yaml".pathChanged() || + "minimal.yaml".pathChanged() || + "minimal/***".pathChanged() + ) creationTimestamp: null labels: appstudio.openshift.io/application: fedora-bootc-rawhide diff --git a/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml b/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml index 80741d6..f5c5426 100644 --- a/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml +++ b/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml @@ -8,10 +8,17 @@ 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() || + "fedora-includes/generic.yaml".pathChanged() || + "standard.yaml".pathChanged() || + "standard/***".pathChanged() + ) creationTimestamp: null labels: appstudio.openshift.io/application: fedora-bootc-rawhide diff --git a/.tekton/fedora-bootc-rawhide-standard-push.yaml b/.tekton/fedora-bootc-rawhide-standard-push.yaml index c7dcead..bca91f1 100644 --- a/.tekton/fedora-bootc-rawhide-standard-push.yaml +++ b/.tekton/fedora-bootc-rawhide-standard-push.yaml @@ -7,10 +7,17 @@ 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 == "main" + ) && ( + ".tekton/fedora-bootc-rawhide-standard-push.yaml".pathChanged() || + "Containerfile".pathChanged() || + "fedora-includes/generic.yaml".pathChanged() || + "standard.yaml".pathChanged() || + "standard/***".pathChanged() + ) creationTimestamp: null labels: appstudio.openshift.io/application: fedora-bootc-rawhide From 3e4fab957336f1d8b5b4db6c78ffdb7e4818fe1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Mart=C3=ADn?= Date: Fri, 27 Jun 2025 14:03:16 +0200 Subject: [PATCH 2/4] Add missing files which must trigger konflux builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes in `bootc-base-imagectl` and `install-manifests` files must trigger konflux builds for all the existing base images. Also changes in "minimal" or "minimal-plus" must trigger konflux builds in all the "standard" images. Signed-off-by: Miguel Martín --- .tekton/fedora-bootc-42-iot-pull-request.yaml | 2 ++ .tekton/fedora-bootc-42-iot-push.yaml | 2 ++ .tekton/fedora-bootc-42-minimal-plus-pull-request.yaml | 2 ++ .tekton/fedora-bootc-42-minimal-plus-push.yaml | 2 ++ .tekton/fedora-bootc-42-minimal-pull-request.yaml | 2 ++ .tekton/fedora-bootc-42-minimal-push.yaml | 2 ++ .tekton/fedora-bootc-42-standard-pull-request.yaml | 7 +++++++ .tekton/fedora-bootc-42-standard-push.yaml | 6 ++++++ .tekton/fedora-bootc-rawhide-iot-pull-request.yaml | 2 ++ .tekton/fedora-bootc-rawhide-iot-push.yaml | 2 ++ .../fedora-bootc-rawhide-minimal-plus-pull-request.yaml | 2 ++ .tekton/fedora-bootc-rawhide-minimal-plus-push.yaml | 2 ++ .tekton/fedora-bootc-rawhide-minimal-pull-request.yaml | 2 ++ .tekton/fedora-bootc-rawhide-minimal-push.yaml | 2 ++ .tekton/fedora-bootc-rawhide-standard-pull-request.yaml | 6 ++++++ .tekton/fedora-bootc-rawhide-standard-push.yaml | 6 ++++++ 16 files changed, 49 insertions(+) diff --git a/.tekton/fedora-bootc-42-iot-pull-request.yaml b/.tekton/fedora-bootc-42-iot-pull-request.yaml index 75032e1..8b341db 100644 --- a/.tekton/fedora-bootc-42-iot-pull-request.yaml +++ b/.tekton/fedora-bootc-42-iot-pull-request.yaml @@ -15,6 +15,8 @@ metadata: ) && ( ".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() || diff --git a/.tekton/fedora-bootc-42-iot-push.yaml b/.tekton/fedora-bootc-42-iot-push.yaml index b7f4fcc..0de8c1a 100644 --- a/.tekton/fedora-bootc-42-iot-push.yaml +++ b/.tekton/fedora-bootc-42-iot-push.yaml @@ -14,6 +14,8 @@ metadata: ) && ( ".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() || diff --git a/.tekton/fedora-bootc-42-minimal-plus-pull-request.yaml b/.tekton/fedora-bootc-42-minimal-plus-pull-request.yaml index 25b51d4..b7a539a 100644 --- a/.tekton/fedora-bootc-42-minimal-plus-pull-request.yaml +++ b/.tekton/fedora-bootc-42-minimal-plus-pull-request.yaml @@ -15,6 +15,8 @@ metadata: ) && ( ".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() || diff --git a/.tekton/fedora-bootc-42-minimal-plus-push.yaml b/.tekton/fedora-bootc-42-minimal-plus-push.yaml index cbb94a4..59b3bd9 100644 --- a/.tekton/fedora-bootc-42-minimal-plus-push.yaml +++ b/.tekton/fedora-bootc-42-minimal-plus-push.yaml @@ -14,6 +14,8 @@ metadata: ) && ( ".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() || diff --git a/.tekton/fedora-bootc-42-minimal-pull-request.yaml b/.tekton/fedora-bootc-42-minimal-pull-request.yaml index a735715..482c1c8 100644 --- a/.tekton/fedora-bootc-42-minimal-pull-request.yaml +++ b/.tekton/fedora-bootc-42-minimal-pull-request.yaml @@ -15,6 +15,8 @@ metadata: ) && ( ".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() diff --git a/.tekton/fedora-bootc-42-minimal-push.yaml b/.tekton/fedora-bootc-42-minimal-push.yaml index 144daaa..545d4ec 100644 --- a/.tekton/fedora-bootc-42-minimal-push.yaml +++ b/.tekton/fedora-bootc-42-minimal-push.yaml @@ -14,6 +14,8 @@ metadata: ) && ( ".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() diff --git a/.tekton/fedora-bootc-42-standard-pull-request.yaml b/.tekton/fedora-bootc-42-standard-pull-request.yaml index 4b8ef8a..1dab7f9 100644 --- a/.tekton/fedora-bootc-42-standard-pull-request.yaml +++ b/.tekton/fedora-bootc-42-standard-pull-request.yaml @@ -15,9 +15,16 @@ metadata: ) && ( ".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 diff --git a/.tekton/fedora-bootc-42-standard-push.yaml b/.tekton/fedora-bootc-42-standard-push.yaml index cc2faaa..4592738 100644 --- a/.tekton/fedora-bootc-42-standard-push.yaml +++ b/.tekton/fedora-bootc-42-standard-push.yaml @@ -14,7 +14,13 @@ metadata: ) && ( ".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() ) diff --git a/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml b/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml index 03f6234..100b3fa 100644 --- a/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml +++ b/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml @@ -15,6 +15,8 @@ metadata: ) && ( ".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() || diff --git a/.tekton/fedora-bootc-rawhide-iot-push.yaml b/.tekton/fedora-bootc-rawhide-iot-push.yaml index e6489d6..edcee18 100644 --- a/.tekton/fedora-bootc-rawhide-iot-push.yaml +++ b/.tekton/fedora-bootc-rawhide-iot-push.yaml @@ -14,6 +14,8 @@ metadata: ) && ( ".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() || diff --git a/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml b/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml index e03eb54..0041242 100644 --- a/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml +++ b/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml @@ -15,6 +15,8 @@ metadata: ) && ( ".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() || diff --git a/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml b/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml index 38dce5e..0b39ba7 100644 --- a/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml +++ b/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml @@ -14,6 +14,8 @@ metadata: ) && ( ".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() || diff --git a/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml b/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml index ba3fe8a..e035abb 100644 --- a/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml +++ b/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml @@ -15,6 +15,8 @@ metadata: ) && ( ".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() diff --git a/.tekton/fedora-bootc-rawhide-minimal-push.yaml b/.tekton/fedora-bootc-rawhide-minimal-push.yaml index 0bc921e..292513c 100644 --- a/.tekton/fedora-bootc-rawhide-minimal-push.yaml +++ b/.tekton/fedora-bootc-rawhide-minimal-push.yaml @@ -14,6 +14,8 @@ metadata: ) && ( ".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() diff --git a/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml b/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml index f5c5426..890b793 100644 --- a/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml +++ b/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml @@ -15,7 +15,13 @@ metadata: ) && ( ".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() ) diff --git a/.tekton/fedora-bootc-rawhide-standard-push.yaml b/.tekton/fedora-bootc-rawhide-standard-push.yaml index bca91f1..9340924 100644 --- a/.tekton/fedora-bootc-rawhide-standard-push.yaml +++ b/.tekton/fedora-bootc-rawhide-standard-push.yaml @@ -14,7 +14,13 @@ metadata: ) && ( ".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() ) From 420f21b36d271ed40107531f7d2a515b11765ff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Mart=C3=ADn?= Date: Fri, 27 Jun 2025 14:10:38 +0200 Subject: [PATCH 3/4] Use 'renovate' prefix for all the branches created by konflux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Martín --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 8b618b1..3b7b9cd 100644 --- a/renovate.json +++ b/renovate.json @@ -19,7 +19,7 @@ ], "enabled": true, "groupName": "Konflux references", - "branchPrefix": "konflux/references/", + "branchPrefix": "renovate/konflux/references/", "group": { "branchTopic": "{{{baseBranch}}}", "commitMessageTopic": "{{{groupName}}}" From aabbd950b63d489e869365c46f0ef8cbbb70a0a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Mart=C3=ADn?= Date: Fri, 27 Jun 2025 14:11:29 +0200 Subject: [PATCH 4/4] 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 --- .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": [