From 3f25a6c5a80c674b4c1f019ceeff5bfe64dc06e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Mart=C3=ADn?= Date: Mon, 30 Jun 2025 10:41:19 +0200 Subject: [PATCH 1/2] Add missing 'or' to 'on-cel-expression' 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tekton/fedora-bootc-42-iot-pull-request.yaml b/.tekton/fedora-bootc-42-iot-pull-request.yaml index 71184f5..edfaa1b 100644 --- a/.tekton/fedora-bootc-42-iot-pull-request.yaml +++ b/.tekton/fedora-bootc-42-iot-pull-request.yaml @@ -20,7 +20,7 @@ metadata: "fedora-includes/generic.yaml".pathChanged() || "minimal.yaml".pathChanged() || "minimal/***".pathChanged() || - "minimal-plus.hidden.yaml".pathChanged() + "minimal-plus.hidden.yaml".pathChanged() || "minimal-plus/***".pathChanged() || "iot.yaml".pathChanged() || "iot/***".pathChanged() From d32441334de74e5e212034e2d57824962fb0aec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Mart=C3=ADn?= Date: Mon, 30 Jun 2025 10:41:58 +0200 Subject: [PATCH 2/2] Use pull request pipelinerun to trigger konflux builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using the on push pipelinerun has an undesired side effect of releasing all the renovate builds before merging them into the main branch. Use the "on pull request" pipelinerun in an attempt to avoid this. Signed-off-by: Miguel Martín --- .tekton/fedora-bootc-42-iot-pull-request.yaml | 4 ++-- .tekton/fedora-bootc-42-iot-push.yaml | 4 +--- .tekton/fedora-bootc-42-minimal-plus-pull-request.yaml | 4 ++-- .tekton/fedora-bootc-42-minimal-plus-push.yaml | 4 +--- .tekton/fedora-bootc-42-minimal-pull-request.yaml | 4 ++-- .tekton/fedora-bootc-42-minimal-push.yaml | 4 +--- .tekton/fedora-bootc-42-standard-pull-request.yaml | 4 ++-- .tekton/fedora-bootc-42-standard-push.yaml | 4 +--- .tekton/fedora-bootc-rawhide-iot-pull-request.yaml | 4 ++-- .tekton/fedora-bootc-rawhide-iot-push.yaml | 4 +--- .tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml | 4 ++-- .tekton/fedora-bootc-rawhide-minimal-plus-push.yaml | 4 +--- .tekton/fedora-bootc-rawhide-minimal-pull-request.yaml | 4 ++-- .tekton/fedora-bootc-rawhide-minimal-push.yaml | 4 +--- .tekton/fedora-bootc-rawhide-standard-pull-request.yaml | 4 ++-- .tekton/fedora-bootc-rawhide-standard-push.yaml | 4 +--- 16 files changed, 24 insertions(+), 40 deletions(-) diff --git a/.tekton/fedora-bootc-42-iot-pull-request.yaml b/.tekton/fedora-bootc-42-iot-pull-request.yaml index edfaa1b..cfff75b 100644 --- a/.tekton/fedora-bootc-42-iot-pull-request.yaml +++ b/.tekton/fedora-bootc-42-iot-pull-request.yaml @@ -9,9 +9,9 @@ metadata: 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" + (event == "pull_request" && target_branch == "main") || + (event == "push" && target_branch.startsWith("renovate/")) ) && ( ".tekton/fedora-bootc-42-iot-pull-request.yaml".pathChanged() || "Containerfile".pathChanged() || diff --git a/.tekton/fedora-bootc-42-iot-push.yaml b/.tekton/fedora-bootc-42-iot-push.yaml index 0e43856..7f3f766 100644 --- a/.tekton/fedora-bootc-42-iot-push.yaml +++ b/.tekton/fedora-bootc-42-iot-push.yaml @@ -8,10 +8,8 @@ metadata: pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: | - event == "push" && ( - target_branch.matches("renovate/.*") || - target_branch == "main" + (event == "push" && target_branch == "main") ) && ( ".tekton/fedora-bootc-42-iot-push.yaml".pathChanged() || "Containerfile".pathChanged() || diff --git a/.tekton/fedora-bootc-42-minimal-plus-pull-request.yaml b/.tekton/fedora-bootc-42-minimal-plus-pull-request.yaml index 6c17bd5..9371c13 100644 --- a/.tekton/fedora-bootc-42-minimal-plus-pull-request.yaml +++ b/.tekton/fedora-bootc-42-minimal-plus-pull-request.yaml @@ -9,9 +9,9 @@ metadata: 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" + (event == "pull_request" && target_branch == "main") || + (event == "push" && target_branch.startsWith("renovate/")) ) && ( ".tekton/fedora-bootc-42-minimal-plus-pull-request.yaml".pathChanged() || "Containerfile".pathChanged() || diff --git a/.tekton/fedora-bootc-42-minimal-plus-push.yaml b/.tekton/fedora-bootc-42-minimal-plus-push.yaml index 36ffc72..58450ad 100644 --- a/.tekton/fedora-bootc-42-minimal-plus-push.yaml +++ b/.tekton/fedora-bootc-42-minimal-plus-push.yaml @@ -8,10 +8,8 @@ metadata: pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: | - event == "push" && ( - target_branch.matches("renovate/.*") || - target_branch == "main" + (event == "push" && target_branch == "main") ) && ( ".tekton/fedora-bootc-42-minimal-plus-push.yaml".pathChanged() || "Containerfile".pathChanged() || diff --git a/.tekton/fedora-bootc-42-minimal-pull-request.yaml b/.tekton/fedora-bootc-42-minimal-pull-request.yaml index 738be8d..1036ae3 100644 --- a/.tekton/fedora-bootc-42-minimal-pull-request.yaml +++ b/.tekton/fedora-bootc-42-minimal-pull-request.yaml @@ -9,9 +9,9 @@ metadata: 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" + (event == "pull_request" && target_branch == "main") || + (event == "push" && target_branch.startsWith("renovate/")) ) && ( ".tekton/fedora-bootc-42-minimal-pull-request.yaml".pathChanged() || "Containerfile".pathChanged() || diff --git a/.tekton/fedora-bootc-42-minimal-push.yaml b/.tekton/fedora-bootc-42-minimal-push.yaml index fc0fb9d..de4bcd7 100644 --- a/.tekton/fedora-bootc-42-minimal-push.yaml +++ b/.tekton/fedora-bootc-42-minimal-push.yaml @@ -8,10 +8,8 @@ metadata: pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: | - event == "push" && ( - target_branch.matches("renovate/.*") || - target_branch == "main" + (event == "push" && target_branch == "main") ) && ( ".tekton/fedora-bootc-42-minimal-push.yaml".pathChanged() || "Containerfile".pathChanged() || diff --git a/.tekton/fedora-bootc-42-standard-pull-request.yaml b/.tekton/fedora-bootc-42-standard-pull-request.yaml index 642300f..2d7d46e 100644 --- a/.tekton/fedora-bootc-42-standard-pull-request.yaml +++ b/.tekton/fedora-bootc-42-standard-pull-request.yaml @@ -9,9 +9,9 @@ metadata: 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" + (event == "pull_request" && target_branch == "main") || + (event == "push" && target_branch.startsWith("renovate/")) ) && ( ".tekton/fedora-bootc-42-standard-pull-request.yaml".pathChanged() || "Containerfile".pathChanged() || diff --git a/.tekton/fedora-bootc-42-standard-push.yaml b/.tekton/fedora-bootc-42-standard-push.yaml index 65ee9f1..8cdb833 100644 --- a/.tekton/fedora-bootc-42-standard-push.yaml +++ b/.tekton/fedora-bootc-42-standard-push.yaml @@ -8,10 +8,8 @@ metadata: pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: | - event == "push" && ( - target_branch.matches("renovate/.*") || - target_branch == "main" + (event == "push" && target_branch == "main") ) && ( ".tekton/fedora-bootc-42-standard-push.yaml".pathChanged() || "Containerfile".pathChanged() || diff --git a/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml b/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml index d4fbc52..9acf168 100644 --- a/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml +++ b/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml @@ -9,9 +9,9 @@ metadata: 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" + (event == "pull_request" && target_branch == "main") || + (event == "push" && target_branch.startsWith("renovate/")) ) && ( ".tekton/fedora-bootc-rawhide-iot-pull-request.yaml".pathChanged() || "Containerfile".pathChanged() || diff --git a/.tekton/fedora-bootc-rawhide-iot-push.yaml b/.tekton/fedora-bootc-rawhide-iot-push.yaml index 46357f1..1ea4e56 100644 --- a/.tekton/fedora-bootc-rawhide-iot-push.yaml +++ b/.tekton/fedora-bootc-rawhide-iot-push.yaml @@ -8,10 +8,8 @@ metadata: pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: | - event == "push" && ( - target_branch.matches("renovate/.*") || - target_branch == "main" + (event == "push" && target_branch == "main") ) && ( ".tekton/fedora-bootc-rawhide-iot-push.yaml".pathChanged() || "Containerfile".pathChanged() || diff --git a/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml b/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml index 873cb13..57d1a21 100644 --- a/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml +++ b/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml @@ -9,9 +9,9 @@ metadata: 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" + (event == "pull_request" && target_branch == "main") || + (event == "push" && target_branch.startsWith("renovate/")) ) && ( ".tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml".pathChanged() || "Containerfile".pathChanged() || diff --git a/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml b/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml index 0e1461a..232d57e 100644 --- a/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml +++ b/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml @@ -8,10 +8,8 @@ metadata: pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: | - event == "push" && ( - target_branch.matches("renovate/.*") || - target_branch == "main" + (event == "push" && target_branch == "main") ) && ( ".tekton/fedora-bootc-rawhide-minimal-plus-push.yaml".pathChanged() || "Containerfile".pathChanged() || diff --git a/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml b/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml index 11c5f0e..ef22163 100644 --- a/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml +++ b/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml @@ -9,9 +9,9 @@ metadata: 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" + (event == "pull_request" && target_branch == "main") || + (event == "push" && target_branch.startsWith("renovate/")) ) && ( ".tekton/fedora-bootc-rawhide-minimal-pull-request.yaml".pathChanged() || "Containerfile".pathChanged() || diff --git a/.tekton/fedora-bootc-rawhide-minimal-push.yaml b/.tekton/fedora-bootc-rawhide-minimal-push.yaml index f8c8e32..97ec314 100644 --- a/.tekton/fedora-bootc-rawhide-minimal-push.yaml +++ b/.tekton/fedora-bootc-rawhide-minimal-push.yaml @@ -8,10 +8,8 @@ metadata: pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: | - event == "push" && ( - target_branch.matches("renovate/.*") || - target_branch == "main" + (event == "push" && target_branch == "main") ) && ( ".tekton/fedora-bootc-rawhide-minimal-push.yaml".pathChanged() || "Containerfile".pathChanged() || diff --git a/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml b/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml index a6cf5ce..19a8b5c 100644 --- a/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml +++ b/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml @@ -9,9 +9,9 @@ metadata: 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" + (event == "pull_request" && target_branch == "main") || + (event == "push" && target_branch.startsWith("renovate/")) ) && ( ".tekton/fedora-bootc-rawhide-standard-pull-request.yaml".pathChanged() || "Containerfile".pathChanged() || diff --git a/.tekton/fedora-bootc-rawhide-standard-push.yaml b/.tekton/fedora-bootc-rawhide-standard-push.yaml index 8ed5df8..bc8ac9a 100644 --- a/.tekton/fedora-bootc-rawhide-standard-push.yaml +++ b/.tekton/fedora-bootc-rawhide-standard-push.yaml @@ -8,10 +8,8 @@ metadata: pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: | - event == "push" && ( - target_branch.matches("renovate/.*") || - target_branch == "main" + (event == "push" && target_branch == "main") ) && ( ".tekton/fedora-bootc-rawhide-standard-push.yaml".pathChanged() || "Containerfile".pathChanged() ||