From 17e7a219646490091d536693a7e3c53fde1a5599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Mart=C3=ADn?= Date: Fri, 9 May 2025 12:09:07 +0200 Subject: [PATCH 1/4] Update rawhide minimal build pipeline --- .tekton/fedora-bootc-rawhide-minimal-on-pull-request.yaml | 2 +- .tekton/fedora-bootc-rawhide-minimal-on-push.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.tekton/fedora-bootc-rawhide-minimal-on-pull-request.yaml b/.tekton/fedora-bootc-rawhide-minimal-on-pull-request.yaml index 5ff2f0f..b987ed3 100644 --- a/.tekton/fedora-bootc-rawhide-minimal-on-pull-request.yaml +++ b/.tekton/fedora-bootc-rawhide-minimal-on-pull-request.yaml @@ -45,7 +45,7 @@ spec: pipelineRef: params: - name: bundle - value: quay.io/fedora-testing/tekton-catalog:pipeline-buildah-build-bootc-multi-platform-oci-ta + value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:2474cc2cd84db2bc0abe595d35a878d01af3bf8783aac0ccc252c9a7a00d8271 - name: name value: buildah-build-bootc-multi-platform-oci-ta - name: kind diff --git a/.tekton/fedora-bootc-rawhide-minimal-on-push.yaml b/.tekton/fedora-bootc-rawhide-minimal-on-push.yaml index a4ef672..50f87a0 100644 --- a/.tekton/fedora-bootc-rawhide-minimal-on-push.yaml +++ b/.tekton/fedora-bootc-rawhide-minimal-on-push.yaml @@ -40,7 +40,7 @@ spec: pipelineRef: params: - name: bundle - value: quay.io/fedora-testing/tekton-catalog:pipeline-buildah-build-bootc-multi-platform-oci-ta + value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:2474cc2cd84db2bc0abe595d35a878d01af3bf8783aac0ccc252c9a7a00d8271 - name: name value: buildah-build-bootc-multi-platform-oci-ta - name: kind From 1c3891199cd2aa33982902c8ffeee1100d375995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Mart=C3=ADn?= Date: Tue, 13 May 2025 15:05:20 +0200 Subject: [PATCH 2/4] Use the pipelinerun filename expected by conflux --- ...uest.yaml => fedora-bootc-rawhide-minimal-pull-request.yaml} | 2 +- ...imal-on-push.yaml => fedora-bootc-rawhide-minimal-push.yaml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename .tekton/{fedora-bootc-rawhide-minimal-on-pull-request.yaml => fedora-bootc-rawhide-minimal-pull-request.yaml} (97%) rename .tekton/{fedora-bootc-rawhide-minimal-on-push.yaml => fedora-bootc-rawhide-minimal-push.yaml} (100%) diff --git a/.tekton/fedora-bootc-rawhide-minimal-on-pull-request.yaml b/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml similarity index 97% rename from .tekton/fedora-bootc-rawhide-minimal-on-pull-request.yaml rename to .tekton/fedora-bootc-rawhide-minimal-pull-request.yaml index b987ed3..fa761ce 100644 --- a/.tekton/fedora-bootc-rawhide-minimal-on-pull-request.yaml +++ b/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml @@ -10,7 +10,7 @@ metadata: pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && ( "./fedora-minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged() - || "./minimal/***".pathChanged() || ".tekton/fedora-bootc-rawhide-minimal-on-pull-request.yaml".pathChanged() + || "./minimal/***".pathChanged() || ".tekton/fedora-bootc-rawhide-minimal-pull-request.yaml".pathChanged() || "Containerfile".pathChanged() ) creationTimestamp: null labels: diff --git a/.tekton/fedora-bootc-rawhide-minimal-on-push.yaml b/.tekton/fedora-bootc-rawhide-minimal-push.yaml similarity index 100% rename from .tekton/fedora-bootc-rawhide-minimal-on-push.yaml rename to .tekton/fedora-bootc-rawhide-minimal-push.yaml From c75de050ab056a5eda5caf6bcc86c50a4296e20c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Mart=C3=ADn?= Date: Tue, 13 May 2025 15:06:01 +0200 Subject: [PATCH 3/4] Use the compose image --- .tekton/fedora-bootc-rawhide-minimal-pull-request.yaml | 2 +- .tekton/fedora-bootc-rawhide-minimal-push.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml b/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml index fa761ce..2f945c2 100644 --- a/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml +++ b/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml @@ -36,7 +36,7 @@ spec: value: true - name: build-args value: - - REPOS_IMAGE=quay.io/fedora/fedora:rawhide + - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-rawhide-compose:Fedora-Rawhide-20250520.n.0@sha256:38ed31949d03f6531a9599d3ca8ee35f5e35a2b353276f2be666e9a9d8eae7fe - MANIFEST=fedora-minimal - name: image-expires-after value: 5d diff --git a/.tekton/fedora-bootc-rawhide-minimal-push.yaml b/.tekton/fedora-bootc-rawhide-minimal-push.yaml index 50f87a0..831f2f7 100644 --- a/.tekton/fedora-bootc-rawhide-minimal-push.yaml +++ b/.tekton/fedora-bootc-rawhide-minimal-push.yaml @@ -33,7 +33,7 @@ spec: value: true - name: build-args value: - - REPOS_IMAGE=quay.io/fedora/fedora:rawhide + - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-rawhide-compose:Fedora-Rawhide-20250520.n.0@sha256:38ed31949d03f6531a9599d3ca8ee35f5e35a2b353276f2be666e9a9d8eae7fe - MANIFEST=fedora-minimal - name: output-image value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-minimal:{{revision}} From 1ee8494bebb4eba73254e0f5d51822865cdcb4c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Mart=C3=ADn?= Date: Thu, 22 May 2025 11:31:52 +0200 Subject: [PATCH 4/4] Do not build minimal image on each push event --- .tekton/fedora-bootc-rawhide-minimal-push.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.tekton/fedora-bootc-rawhide-minimal-push.yaml b/.tekton/fedora-bootc-rawhide-minimal-push.yaml index 831f2f7..7d14eb0 100644 --- a/.tekton/fedora-bootc-rawhide-minimal-push.yaml +++ b/.tekton/fedora-bootc-rawhide-minimal-push.yaml @@ -8,7 +8,9 @@ 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 - == "main" + == "main" && ( "./fedora-minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged() + || "./minimal/***".pathChanged() || ".tekton/fedora-bootc-rawhide-minimal-push.yaml".pathChanged() + || "Containerfile".pathChanged() ) creationTimestamp: null labels: appstudio.openshift.io/application: fedora-bootc-rawhide