From 282f286a23c439fe61dbbacb53f322d6a86e6cff Mon Sep 17 00:00:00 2001 From: serverless-qe Date: Wed, 29 Oct 2025 08:34:12 +0000 Subject: [PATCH 1/2] Generate dockerfiles with "./openshift/scripts/generate-dockerfiles.sh" --- openshift/ci-operator/build-image/Dockerfile | 6 +- .../knative-images/func-util/Dockerfile | 13 +- rpms.lock.yaml | 456 +++++++++++------- 3 files changed, 291 insertions(+), 184 deletions(-) diff --git a/openshift/ci-operator/build-image/Dockerfile b/openshift/ci-operator/build-image/Dockerfile index c141d4fb90..319e4dfaac 100755 --- a/openshift/ci-operator/build-image/Dockerfile +++ b/openshift/ci-operator/build-image/Dockerfile @@ -1,17 +1,17 @@ # DO NOT EDIT! Generated Dockerfile. -FROM registry.ci.openshift.org/ocp/4.17:cli-artifacts as tools +FROM registry.ci.openshift.org/ocp/4.19:cli-artifacts as tools # Dockerfile to bootstrap build and test in openshift-ci FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder ARG TARGETARCH -COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel8 /usr/bin/oc +COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel9 /usr/bin/oc RUN ln -s /usr/bin/oc /usr/bin/kubectl -RUN yum install -y httpd-tools +RUN dnf install -y httpd-tools RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && \ chmod 700 ./get-helm-3 diff --git a/openshift/ci-operator/knative-images/func-util/Dockerfile b/openshift/ci-operator/knative-images/func-util/Dockerfile index 191353ae4f..2c0c5f615e 100755 --- a/openshift/ci-operator/knative-images/func-util/Dockerfile +++ b/openshift/ci-operator/knative-images/func-util/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for cmd/func-util. ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -17,7 +17,7 @@ FROM $GO_RUNTIME ARG VERSION=knative-nightly -RUN microdnf install socat tar +RUN microdnf install -y socat tar COPY --from=builder /usr/bin/main /usr/bin/func-util COPY LICENSE /licenses/ @@ -30,14 +30,17 @@ RUN ln -s /usr/bin/func-util /usr/local/bin/deploy && \ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-kn-plugin-func-func-util-rhel8-container" \ - name="openshift-serverless-1/kn-plugin-func-func-util-rhel8" \ + com.redhat.component="openshift-serverless-1-kn-plugin-func-func-util-rhel9-container" \ + name="openshift-serverless-1/kn-plugin-func-func-util-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Kn Plugin Func Func Util" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Kn Plugin Func Func Util" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Kn Plugin Func Func Util" \ io.k8s.description="Red Hat OpenShift Serverless Kn Plugin Func Func Util" \ - io.openshift.tags="func-util" + io.openshift.tags="func-util" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:::el9" ENTRYPOINT ["/usr/bin/bash"] diff --git a/rpms.lock.yaml b/rpms.lock.yaml index c551512482..bddbf6d5a4 100644 --- a/rpms.lock.yaml +++ b/rpms.lock.yaml @@ -4,225 +4,329 @@ lockfileVendor: redhat arches: - arch: aarch64 packages: - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/appstream/os/Packages/s/socat-1.7.4.1-1.el8.aarch64.rpm - repoid: ubi-8-for-aarch64-appstream-rpms - size: 324364 - checksum: sha256:eb27326c2f3f7c813f0f21e15177ab3f4c74778e2ef8029de51aafb09445c515 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/appstream/os/Packages/s/socat-1.7.4.1-6.el9_6.1.aarch64.rpm + repoid: ubi-9-for-aarch64-appstream-rpms + size: 307871 + checksum: sha256:9f0e56543ef34d3e71895daa16b1b46412d98809ea41046d44c9e1be80fe7966 name: socat - evr: 1.7.4.1-1.el8 - sourcerpm: socat-1.7.4.1-1.el8.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/r/rsync-3.1.3-21.el8_10.aarch64.rpm - repoid: ubi-8-for-aarch64-baseos-rpms - size: 410884 - checksum: sha256:c2abdc201cedd3e1831955ae628c644ab670214126697695c77657edbbeaecb2 + evr: 1.7.4.1-6.el9_6.1 + sourcerpm: socat-1.7.4.1-6.el9_6.1.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/os/Packages/r/rsync-3.2.5-3.el9.aarch64.rpm + repoid: ubi-9-for-aarch64-baseos-rpms + size: 416293 + checksum: sha256:99235a7555f6454898ebbcdcf927ebed68e3a60599c9226b9d1d60578d292878 name: rsync - evr: 3.1.3-21.el8_10 - sourcerpm: rsync-3.1.3-21.el8_10.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/t/tar-1.30-9.el8.aarch64.rpm - repoid: ubi-8-for-aarch64-baseos-rpms - size: 849892 - checksum: sha256:3ba95ecab30f49ecf168ee37e6bc332b626bde62ef7bf61801613f93e2126d8e + evr: 3.2.5-3.el9 + sourcerpm: rsync-3.2.5-3.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/os/Packages/t/tar-1.34-7.el9.aarch64.rpm + repoid: ubi-9-for-aarch64-baseos-rpms + size: 900197 + checksum: sha256:44552dea889d350403c3074a33d7cb274b3f57553e47db998745df13f931b458 name: tar - evr: 2:1.30-9.el8 - sourcerpm: tar-1.30-9.el8.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/t/tzdata-2025b-1.el8.noarch.rpm - repoid: ubi-8-for-aarch64-baseos-rpms - size: 488428 - checksum: sha256:338539f7f0cd2770694153af81e2e65121b050a1bb555ad66a6fb6f562732602 + evr: 2:1.34-7.el9 + sourcerpm: tar-1.34-7.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/os/Packages/t/tzdata-2025b-1.el9.noarch.rpm + repoid: ubi-9-for-aarch64-baseos-rpms + size: 862160 + checksum: sha256:0687e5a1115ba679137404c8d37a45141a31968ffd01677455530d24c126a0d2 name: tzdata - evr: 2025b-1.el8 - sourcerpm: tzdata-2025b-1.el8.src.rpm + evr: 2025b-1.el9 + sourcerpm: tzdata-2025b-1.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/os/Packages/u/unzip-6.0-58.el9_5.aarch64.rpm + repoid: ubi-9-for-aarch64-baseos-rpms + size: 186875 + checksum: sha256:edc9b5c0adcfbe04cbfd4cc6a23d326c82ab816eb1fc521f7e483add8bb2b8cd + name: unzip + evr: 6.0-58.el9_5 + sourcerpm: unzip-6.0-58.el9_5.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/os/Packages/z/zip-3.0-35.el9.aarch64.rpm + repoid: ubi-9-for-aarch64-baseos-rpms + size: 269791 + checksum: sha256:4dfc9b2afc08b96cba0a8c7f06be5691ec26f2104d9c1a100aa0432e30aac3cd + name: zip + evr: 3.0-35.el9 + sourcerpm: zip-3.0-35.el9.src.rpm source: - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-1.el8.src.rpm - repoid: ubi-8-for-aarch64-appstream-source-rpms - size: 666330 - checksum: sha256:fde85ccbec9a4dabe98d7cf695d394f43fad1ec9b03c167f97430d6eb724b946 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-6.el9_6.1.src.rpm + repoid: ubi-9-for-aarch64-appstream-source-rpms + size: 664341 + checksum: sha256:cc4dafb6691824cae1db6f8c99baba2e9af74fdab06334f14558272cb3e92832 name: socat - evr: 1.7.4.1-1.el8 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/source/SRPMS/Packages/r/rsync-3.1.3-21.el8_10.src.rpm - repoid: ubi-8-for-aarch64-baseos-source-rpms - size: 1149684 - checksum: sha256:8dd8cd91786a1a30835e61c75f2f56b0449680583cff5be4e396fd82bfaab7c1 + evr: 1.7.4.1-6.el9_6.1 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/source/SRPMS/Packages/r/rsync-3.2.5-3.el9.src.rpm + repoid: ubi-9-for-aarch64-baseos-source-rpms + size: 1306931 + checksum: sha256:a1fd44e58d1fb5b52b72586c5ef2e12c040428f771cde1d1350b36d3b9155db0 name: rsync - evr: 3.1.3-21.el8_10 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/source/SRPMS/Packages/t/tar-1.30-9.el8.src.rpm - repoid: ubi-8-for-aarch64-baseos-source-rpms - size: 2169236 - checksum: sha256:53ae8ab2f98cb36c9d7e3830a7a8d6a9897707bf3d0f0c6805282f88ca6e23f7 + evr: 3.2.5-3.el9 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/source/SRPMS/Packages/t/tar-1.34-7.el9.src.rpm + repoid: ubi-9-for-aarch64-baseos-source-rpms + size: 2261512 + checksum: sha256:d002c400d29e7305fe8a982ab6b9f49ee7a8780e4574b86fc0c5b3d5510ecb22 name: tar - evr: 2:1.30-9.el8 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/source/SRPMS/Packages/t/tzdata-2025b-1.el8.src.rpm - repoid: ubi-8-for-aarch64-baseos-source-rpms - size: 946701 - checksum: sha256:2f0ba51d371713287a690d9d1635b534113258aa2571862603d52870c1c8b60d + evr: 2:1.34-7.el9 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/source/SRPMS/Packages/t/tzdata-2025b-1.el9.src.rpm + repoid: ubi-9-for-aarch64-baseos-source-rpms + size: 904607 + checksum: sha256:a2668d1f6b053545a5824a428755484895d72475a9d3833cbfbec9e08660aba2 name: tzdata - evr: 2025b-1.el8 + evr: 2025b-1.el9 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/source/SRPMS/Packages/u/unzip-6.0-58.el9_5.src.rpm + repoid: ubi-9-for-aarch64-baseos-source-rpms + size: 1436757 + checksum: sha256:49de0234c5e8f588c94b435c35225bcccd4cc94bb19cac94110d9aa0c5060f69 + name: unzip + evr: 6.0-58.el9_5 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/source/SRPMS/Packages/z/zip-3.0-35.el9.src.rpm + repoid: ubi-9-for-aarch64-baseos-source-rpms + size: 1137410 + checksum: sha256:416b6957a4365204cfb2ba9e5b9b9f21075b615114c6afe46c83166de258bb5d + name: zip + evr: 3.0-35.el9 module_metadata: [] - arch: ppc64le packages: - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/appstream/os/Packages/s/socat-1.7.4.1-1.el8.ppc64le.rpm - repoid: ubi-8-for-ppc64le-appstream-rpms - size: 337076 - checksum: sha256:51f267ce6469e7967815e1f202b8afa84010717ff24fbff30c7c1bc9ee15d1d1 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/appstream/os/Packages/s/socat-1.7.4.1-6.el9_6.1.ppc64le.rpm + repoid: ubi-9-for-ppc64le-appstream-rpms + size: 320029 + checksum: sha256:93b2c5e9fb6987a6658763469ecce247fef2bed03a2b973249cf8134dda8a3c0 name: socat - evr: 1.7.4.1-1.el8 - sourcerpm: socat-1.7.4.1-1.el8.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/r/rsync-3.1.3-21.el8_10.ppc64le.rpm - repoid: ubi-8-for-ppc64le-baseos-rpms - size: 443544 - checksum: sha256:13fc835eb33dbf991d34cc204f79fb84938176ea53442073187178818823e373 + evr: 1.7.4.1-6.el9_6.1 + sourcerpm: socat-1.7.4.1-6.el9_6.1.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/os/Packages/r/rsync-3.2.5-3.el9.ppc64le.rpm + repoid: ubi-9-for-ppc64le-baseos-rpms + size: 449938 + checksum: sha256:1fd8762ad73a60556c9808a5bf2a9d964965adec91c026ef27058266dc75e1f0 name: rsync - evr: 3.1.3-21.el8_10 - sourcerpm: rsync-3.1.3-21.el8_10.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/t/tar-1.30-9.el8.ppc64le.rpm - repoid: ubi-8-for-ppc64le-baseos-rpms - size: 878620 - checksum: sha256:c34619440c83b785306420d9ae4a21ccbafe09815e5631510cccb6433f435a47 + evr: 3.2.5-3.el9 + sourcerpm: rsync-3.2.5-3.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/os/Packages/t/tar-1.34-7.el9.ppc64le.rpm + repoid: ubi-9-for-ppc64le-baseos-rpms + size: 937724 + checksum: sha256:f2cc206dfacc9981fad6cf33600ad28bcd1c573f16d8c18523dc9df52ca90660 name: tar - evr: 2:1.30-9.el8 - sourcerpm: tar-1.30-9.el8.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/t/tzdata-2025b-1.el8.noarch.rpm - repoid: ubi-8-for-ppc64le-baseos-rpms - size: 488428 - checksum: sha256:338539f7f0cd2770694153af81e2e65121b050a1bb555ad66a6fb6f562732602 + evr: 2:1.34-7.el9 + sourcerpm: tar-1.34-7.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/os/Packages/t/tzdata-2025b-1.el9.noarch.rpm + repoid: ubi-9-for-ppc64le-baseos-rpms + size: 862160 + checksum: sha256:0687e5a1115ba679137404c8d37a45141a31968ffd01677455530d24c126a0d2 name: tzdata - evr: 2025b-1.el8 - sourcerpm: tzdata-2025b-1.el8.src.rpm + evr: 2025b-1.el9 + sourcerpm: tzdata-2025b-1.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/os/Packages/u/unzip-6.0-58.el9_5.ppc64le.rpm + repoid: ubi-9-for-ppc64le-baseos-rpms + size: 195024 + checksum: sha256:7b2b6dfa5eb402f02bbec69c096f12404223dab040cda6ae55a927d104d607bb + name: unzip + evr: 6.0-58.el9_5 + sourcerpm: unzip-6.0-58.el9_5.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/os/Packages/z/zip-3.0-35.el9.ppc64le.rpm + repoid: ubi-9-for-ppc64le-baseos-rpms + size: 282944 + checksum: sha256:9af29cefba99330a06abd6ace7eb1f3ea77d1b2d50a2cd6d4e3fade1e603f26f + name: zip + evr: 3.0-35.el9 + sourcerpm: zip-3.0-35.el9.src.rpm source: - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-1.el8.src.rpm - repoid: ubi-8-for-ppc64le-appstream-source-rpms - size: 666330 - checksum: sha256:fde85ccbec9a4dabe98d7cf695d394f43fad1ec9b03c167f97430d6eb724b946 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-6.el9_6.1.src.rpm + repoid: ubi-9-for-ppc64le-appstream-source-rpms + size: 664341 + checksum: sha256:cc4dafb6691824cae1db6f8c99baba2e9af74fdab06334f14558272cb3e92832 name: socat - evr: 1.7.4.1-1.el8 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/source/SRPMS/Packages/r/rsync-3.1.3-21.el8_10.src.rpm - repoid: ubi-8-for-ppc64le-baseos-source-rpms - size: 1149684 - checksum: sha256:8dd8cd91786a1a30835e61c75f2f56b0449680583cff5be4e396fd82bfaab7c1 + evr: 1.7.4.1-6.el9_6.1 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/source/SRPMS/Packages/r/rsync-3.2.5-3.el9.src.rpm + repoid: ubi-9-for-ppc64le-baseos-source-rpms + size: 1306931 + checksum: sha256:a1fd44e58d1fb5b52b72586c5ef2e12c040428f771cde1d1350b36d3b9155db0 name: rsync - evr: 3.1.3-21.el8_10 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/source/SRPMS/Packages/t/tar-1.30-9.el8.src.rpm - repoid: ubi-8-for-ppc64le-baseos-source-rpms - size: 2169236 - checksum: sha256:53ae8ab2f98cb36c9d7e3830a7a8d6a9897707bf3d0f0c6805282f88ca6e23f7 + evr: 3.2.5-3.el9 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/source/SRPMS/Packages/t/tar-1.34-7.el9.src.rpm + repoid: ubi-9-for-ppc64le-baseos-source-rpms + size: 2261512 + checksum: sha256:d002c400d29e7305fe8a982ab6b9f49ee7a8780e4574b86fc0c5b3d5510ecb22 name: tar - evr: 2:1.30-9.el8 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/source/SRPMS/Packages/t/tzdata-2025b-1.el8.src.rpm - repoid: ubi-8-for-ppc64le-baseos-source-rpms - size: 946701 - checksum: sha256:2f0ba51d371713287a690d9d1635b534113258aa2571862603d52870c1c8b60d + evr: 2:1.34-7.el9 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/source/SRPMS/Packages/t/tzdata-2025b-1.el9.src.rpm + repoid: ubi-9-for-ppc64le-baseos-source-rpms + size: 904607 + checksum: sha256:a2668d1f6b053545a5824a428755484895d72475a9d3833cbfbec9e08660aba2 name: tzdata - evr: 2025b-1.el8 + evr: 2025b-1.el9 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/source/SRPMS/Packages/u/unzip-6.0-58.el9_5.src.rpm + repoid: ubi-9-for-ppc64le-baseos-source-rpms + size: 1436757 + checksum: sha256:49de0234c5e8f588c94b435c35225bcccd4cc94bb19cac94110d9aa0c5060f69 + name: unzip + evr: 6.0-58.el9_5 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/source/SRPMS/Packages/z/zip-3.0-35.el9.src.rpm + repoid: ubi-9-for-ppc64le-baseos-source-rpms + size: 1137410 + checksum: sha256:416b6957a4365204cfb2ba9e5b9b9f21075b615114c6afe46c83166de258bb5d + name: zip + evr: 3.0-35.el9 module_metadata: [] - arch: s390x packages: - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/appstream/os/Packages/s/socat-1.7.4.1-1.el8.s390x.rpm - repoid: ubi-8-for-s390x-appstream-rpms - size: 320544 - checksum: sha256:4e8380ed4b4570663136b8b499bfe343b688bda676028ef5172d2155ac80e6ae + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/appstream/os/Packages/s/socat-1.7.4.1-6.el9_6.1.s390x.rpm + repoid: ubi-9-for-s390x-appstream-rpms + size: 304533 + checksum: sha256:a253a1f53e95847ee879cda007ad471eeb4d4a6f01b526f5b819bcbf339cd12a name: socat - evr: 1.7.4.1-1.el8 - sourcerpm: socat-1.7.4.1-1.el8.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/r/rsync-3.1.3-21.el8_10.s390x.rpm - repoid: ubi-8-for-s390x-baseos-rpms - size: 414124 - checksum: sha256:a96c06ec291a0246b8b060b1c2744015e0d3b0ad2f2785adb216ca60e1c6244e + evr: 1.7.4.1-6.el9_6.1 + sourcerpm: socat-1.7.4.1-6.el9_6.1.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/os/Packages/r/rsync-3.2.5-3.el9.s390x.rpm + repoid: ubi-9-for-s390x-baseos-rpms + size: 418877 + checksum: sha256:2d1a87e86fb23bc665b7c7ce8775c73d500ef6e152f15c78493b95638dfb7925 name: rsync - evr: 3.1.3-21.el8_10 - sourcerpm: rsync-3.1.3-21.el8_10.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/t/tar-1.30-9.el8.s390x.rpm - repoid: ubi-8-for-s390x-baseos-rpms - size: 853548 - checksum: sha256:1efadfc1d2113503b8b0e95939c4cb98a7e0095fb383dec2ac4bf652822a8d87 + evr: 3.2.5-3.el9 + sourcerpm: rsync-3.2.5-3.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/os/Packages/t/tar-1.34-7.el9.s390x.rpm + repoid: ubi-9-for-s390x-baseos-rpms + size: 902370 + checksum: sha256:fa8758bac6a56830de66ad1ab623c87768065bcc6f8242faa42ac4198260d456 name: tar - evr: 2:1.30-9.el8 - sourcerpm: tar-1.30-9.el8.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/t/tzdata-2025b-1.el8.noarch.rpm - repoid: ubi-8-for-s390x-baseos-rpms - size: 488428 - checksum: sha256:338539f7f0cd2770694153af81e2e65121b050a1bb555ad66a6fb6f562732602 + evr: 2:1.34-7.el9 + sourcerpm: tar-1.34-7.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/os/Packages/t/tzdata-2025b-1.el9.noarch.rpm + repoid: ubi-9-for-s390x-baseos-rpms + size: 862160 + checksum: sha256:0687e5a1115ba679137404c8d37a45141a31968ffd01677455530d24c126a0d2 name: tzdata - evr: 2025b-1.el8 - sourcerpm: tzdata-2025b-1.el8.src.rpm + evr: 2025b-1.el9 + sourcerpm: tzdata-2025b-1.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/os/Packages/u/unzip-6.0-58.el9_5.s390x.rpm + repoid: ubi-9-for-s390x-baseos-rpms + size: 185386 + checksum: sha256:b772da82fd038a447b98428d31ed3d3c3208a4c37960f5d2fadd0070df64d157 + name: unzip + evr: 6.0-58.el9_5 + sourcerpm: unzip-6.0-58.el9_5.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/os/Packages/z/zip-3.0-35.el9.s390x.rpm + repoid: ubi-9-for-s390x-baseos-rpms + size: 276776 + checksum: sha256:ac9f81e15ac141940073706ed38e3efd1d2278642d80dbd2945b28f0e6ffae62 + name: zip + evr: 3.0-35.el9 + sourcerpm: zip-3.0-35.el9.src.rpm source: - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-1.el8.src.rpm - repoid: ubi-8-for-s390x-appstream-source-rpms - size: 666330 - checksum: sha256:fde85ccbec9a4dabe98d7cf695d394f43fad1ec9b03c167f97430d6eb724b946 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-6.el9_6.1.src.rpm + repoid: ubi-9-for-s390x-appstream-source-rpms + size: 664341 + checksum: sha256:cc4dafb6691824cae1db6f8c99baba2e9af74fdab06334f14558272cb3e92832 name: socat - evr: 1.7.4.1-1.el8 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/source/SRPMS/Packages/r/rsync-3.1.3-21.el8_10.src.rpm - repoid: ubi-8-for-s390x-baseos-source-rpms - size: 1149684 - checksum: sha256:8dd8cd91786a1a30835e61c75f2f56b0449680583cff5be4e396fd82bfaab7c1 + evr: 1.7.4.1-6.el9_6.1 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/source/SRPMS/Packages/r/rsync-3.2.5-3.el9.src.rpm + repoid: ubi-9-for-s390x-baseos-source-rpms + size: 1306931 + checksum: sha256:a1fd44e58d1fb5b52b72586c5ef2e12c040428f771cde1d1350b36d3b9155db0 name: rsync - evr: 3.1.3-21.el8_10 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/source/SRPMS/Packages/t/tar-1.30-9.el8.src.rpm - repoid: ubi-8-for-s390x-baseos-source-rpms - size: 2169236 - checksum: sha256:53ae8ab2f98cb36c9d7e3830a7a8d6a9897707bf3d0f0c6805282f88ca6e23f7 + evr: 3.2.5-3.el9 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/source/SRPMS/Packages/t/tar-1.34-7.el9.src.rpm + repoid: ubi-9-for-s390x-baseos-source-rpms + size: 2261512 + checksum: sha256:d002c400d29e7305fe8a982ab6b9f49ee7a8780e4574b86fc0c5b3d5510ecb22 name: tar - evr: 2:1.30-9.el8 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/source/SRPMS/Packages/t/tzdata-2025b-1.el8.src.rpm - repoid: ubi-8-for-s390x-baseos-source-rpms - size: 946701 - checksum: sha256:2f0ba51d371713287a690d9d1635b534113258aa2571862603d52870c1c8b60d + evr: 2:1.34-7.el9 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/source/SRPMS/Packages/t/tzdata-2025b-1.el9.src.rpm + repoid: ubi-9-for-s390x-baseos-source-rpms + size: 904607 + checksum: sha256:a2668d1f6b053545a5824a428755484895d72475a9d3833cbfbec9e08660aba2 name: tzdata - evr: 2025b-1.el8 + evr: 2025b-1.el9 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/source/SRPMS/Packages/u/unzip-6.0-58.el9_5.src.rpm + repoid: ubi-9-for-s390x-baseos-source-rpms + size: 1436757 + checksum: sha256:49de0234c5e8f588c94b435c35225bcccd4cc94bb19cac94110d9aa0c5060f69 + name: unzip + evr: 6.0-58.el9_5 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/source/SRPMS/Packages/z/zip-3.0-35.el9.src.rpm + repoid: ubi-9-for-s390x-baseos-source-rpms + size: 1137410 + checksum: sha256:416b6957a4365204cfb2ba9e5b9b9f21075b615114c6afe46c83166de258bb5d + name: zip + evr: 3.0-35.el9 module_metadata: [] - arch: x86_64 packages: - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/appstream/os/Packages/s/socat-1.7.4.1-1.el8.x86_64.rpm - repoid: ubi-8-for-x86_64-appstream-rpms - size: 330744 - checksum: sha256:b03b86ac05bd5871f14e00400a6ddd30d8e9ed97b93e56e96789706c36e2f379 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/appstream/os/Packages/s/socat-1.7.4.1-6.el9_6.1.x86_64.rpm + repoid: ubi-9-for-x86_64-appstream-rpms + size: 310772 + checksum: sha256:9ac9ded656ee3afbdbf3ac00f5f678101b3461df626998a7bd92f10546345396 name: socat - evr: 1.7.4.1-1.el8 - sourcerpm: socat-1.7.4.1-1.el8.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/r/rsync-3.1.3-21.el8_10.x86_64.rpm - repoid: ubi-8-for-x86_64-baseos-rpms - size: 420856 - checksum: sha256:c65fc8397e47b5c9a3e3ca8b1aca7136a1534ecbfb76884bdc0dde075e1f990b + evr: 1.7.4.1-6.el9_6.1 + sourcerpm: socat-1.7.4.1-6.el9_6.1.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/os/Packages/r/rsync-3.2.5-3.el9.x86_64.rpm + repoid: ubi-9-for-x86_64-baseos-rpms + size: 421930 + checksum: sha256:b1d90c38b613f2d66dfe0c7c3d067a3ce429f7b2ec5224e560f326fc2fd8d1e5 name: rsync - evr: 3.1.3-21.el8_10 - sourcerpm: rsync-3.1.3-21.el8_10.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/t/tar-1.30-9.el8.x86_64.rpm - repoid: ubi-8-for-x86_64-baseos-rpms - size: 858812 - checksum: sha256:6b0dc7341d743c89fa038292a7e04761ebb6cc98208ebc26dee9f01e2c1a9529 + evr: 3.2.5-3.el9 + sourcerpm: rsync-3.2.5-3.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/os/Packages/t/tar-1.34-7.el9.x86_64.rpm + repoid: ubi-9-for-x86_64-baseos-rpms + size: 910235 + checksum: sha256:17f2e592a2c04c050b690afeb9042e02521a0b5ee3288dad837463f4acf542c3 name: tar - evr: 2:1.30-9.el8 - sourcerpm: tar-1.30-9.el8.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/t/tzdata-2025b-1.el8.noarch.rpm - repoid: ubi-8-for-x86_64-baseos-rpms - size: 488428 - checksum: sha256:338539f7f0cd2770694153af81e2e65121b050a1bb555ad66a6fb6f562732602 + evr: 2:1.34-7.el9 + sourcerpm: tar-1.34-7.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/os/Packages/t/tzdata-2025b-1.el9.noarch.rpm + repoid: ubi-9-for-x86_64-baseos-rpms + size: 862160 + checksum: sha256:0687e5a1115ba679137404c8d37a45141a31968ffd01677455530d24c126a0d2 name: tzdata - evr: 2025b-1.el8 - sourcerpm: tzdata-2025b-1.el8.src.rpm + evr: 2025b-1.el9 + sourcerpm: tzdata-2025b-1.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/os/Packages/u/unzip-6.0-58.el9_5.x86_64.rpm + repoid: ubi-9-for-x86_64-baseos-rpms + size: 190785 + checksum: sha256:009698f3b4432b9df219fd2f894234aad1cee8c4e4e61384b4e293ef8e28e9c2 + name: unzip + evr: 6.0-58.el9_5 + sourcerpm: unzip-6.0-58.el9_5.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/os/Packages/z/zip-3.0-35.el9.x86_64.rpm + repoid: ubi-9-for-x86_64-baseos-rpms + size: 276200 + checksum: sha256:ef28011ba191f53260cebb1e42b0148ae65d9029940146699e802f501dba009c + name: zip + evr: 3.0-35.el9 + sourcerpm: zip-3.0-35.el9.src.rpm source: - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-1.el8.src.rpm - repoid: ubi-8-for-x86_64-appstream-source-rpms - size: 666330 - checksum: sha256:fde85ccbec9a4dabe98d7cf695d394f43fad1ec9b03c167f97430d6eb724b946 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-6.el9_6.1.src.rpm + repoid: ubi-9-for-x86_64-appstream-source-rpms + size: 664341 + checksum: sha256:cc4dafb6691824cae1db6f8c99baba2e9af74fdab06334f14558272cb3e92832 name: socat - evr: 1.7.4.1-1.el8 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/source/SRPMS/Packages/r/rsync-3.1.3-21.el8_10.src.rpm - repoid: ubi-8-for-x86_64-baseos-source-rpms - size: 1149684 - checksum: sha256:8dd8cd91786a1a30835e61c75f2f56b0449680583cff5be4e396fd82bfaab7c1 + evr: 1.7.4.1-6.el9_6.1 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/source/SRPMS/Packages/r/rsync-3.2.5-3.el9.src.rpm + repoid: ubi-9-for-x86_64-baseos-source-rpms + size: 1306931 + checksum: sha256:a1fd44e58d1fb5b52b72586c5ef2e12c040428f771cde1d1350b36d3b9155db0 name: rsync - evr: 3.1.3-21.el8_10 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/source/SRPMS/Packages/t/tar-1.30-9.el8.src.rpm - repoid: ubi-8-for-x86_64-baseos-source-rpms - size: 2169236 - checksum: sha256:53ae8ab2f98cb36c9d7e3830a7a8d6a9897707bf3d0f0c6805282f88ca6e23f7 + evr: 3.2.5-3.el9 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/source/SRPMS/Packages/t/tar-1.34-7.el9.src.rpm + repoid: ubi-9-for-x86_64-baseos-source-rpms + size: 2261512 + checksum: sha256:d002c400d29e7305fe8a982ab6b9f49ee7a8780e4574b86fc0c5b3d5510ecb22 name: tar - evr: 2:1.30-9.el8 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/source/SRPMS/Packages/t/tzdata-2025b-1.el8.src.rpm - repoid: ubi-8-for-x86_64-baseos-source-rpms - size: 946701 - checksum: sha256:2f0ba51d371713287a690d9d1635b534113258aa2571862603d52870c1c8b60d + evr: 2:1.34-7.el9 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/source/SRPMS/Packages/t/tzdata-2025b-1.el9.src.rpm + repoid: ubi-9-for-x86_64-baseos-source-rpms + size: 904607 + checksum: sha256:a2668d1f6b053545a5824a428755484895d72475a9d3833cbfbec9e08660aba2 name: tzdata - evr: 2025b-1.el8 + evr: 2025b-1.el9 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/source/SRPMS/Packages/u/unzip-6.0-58.el9_5.src.rpm + repoid: ubi-9-for-x86_64-baseos-source-rpms + size: 1436757 + checksum: sha256:49de0234c5e8f588c94b435c35225bcccd4cc94bb19cac94110d9aa0c5060f69 + name: unzip + evr: 6.0-58.el9_5 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/source/SRPMS/Packages/z/zip-3.0-35.el9.src.rpm + repoid: ubi-9-for-x86_64-baseos-source-rpms + size: 1137410 + checksum: sha256:416b6957a4365204cfb2ba9e5b9b9f21075b615114c6afe46c83166de258bb5d + name: zip + evr: 3.0-35.el9 module_metadata: [] From e0b3fd29341c71f095a7cf57a5ebd847fb60b8bc Mon Sep 17 00:00:00 2001 From: serverless-qe Date: Wed, 29 Oct 2025 08:34:14 +0000 Subject: [PATCH 2/2] [release-v1.15] Sync Konflux configurations --- .tekton/docker-build.yaml | 81 ++++++++++--------- ...lugin-func-func-util-115-pull-request.yaml | 2 +- .../kn-plugin-func-func-util-115-push.yaml | 4 +- 3 files changed, 48 insertions(+), 39 deletions(-) diff --git a/.tekton/docker-build.yaml b/.tekton/docker-build.yaml index 3e9f2cb58b..c711b08c76 100755 --- a/.tekton/docker-build.yaml +++ b/.tekton/docker-build.yaml @@ -1,7 +1,7 @@ apiVersion: tekton.dev/v1 kind: Pipeline metadata: - creationTimestamp: + creationTimestamp: null labels: pipelines.openshift.io/runtime: generic pipelines.openshift.io/strategy: docker @@ -11,29 +11,16 @@ spec: description: | This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization. - _Uses `buildah` to create a multi-platform container image leveraging [trusted artifacts](https://konflux-ci.dev/architecture/ADR/0036-trusted-artifacts.html). It also optionally creates a source image and runs some build-time tests. This pipeline requires that the [multi platform controller](https://github.com/konflux-ci/multi-platform-controller) is deployed and configured on your Konflux instance. Information is shared between tasks using OCI artifacts instead of PVCs. EC will pass the [`trusted_task.trusted`](https://enterprisecontract.dev/docs/ec-policies/release_policy.html#trusted_task__trusted) policy as long as all data used to build the artifact is generated from trusted tasks. + _Uses `buildah` to create a multi-platform container image leveraging [trusted artifacts](https://konflux-ci.dev/architecture/ADR/0036-trusted-artifacts.html). It also optionally creates a source image and runs some build-time tests. This pipeline requires that the [multi platform controller](https://github.com/konflux-ci/multi-platform-controller) is deployed and configured on your Konflux instance. Information is shared between tasks using OCI artifacts instead of PVCs. EC will pass the [`trusted_task.trusted`](https://conforma.dev/docs/policy/packages/release_trusted_task.html#trusted_task__trusted) policy as long as all data used to build the artifact is generated from trusted tasks. This pipeline is pushed as a Tekton bundle to [quay.io](https://quay.io/repository/konflux-ci/tekton-catalog/pipeline-docker-build-multi-platform-oci-ta?tab=tags)_ - finally: - - name: show-sbom - params: - - name: IMAGE_URL - value: $(tasks.build-image-index.results.IMAGE_URL) - taskRef: - params: - - name: name - value: show-sbom - - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:beb0616db051952b4b861dd8c3e00fa1c0eccbd926feddf71194d3bb3ace9ce7 - - name: kind - value: task - resolver: bundles params: - default: - linux/x86_64 - linux/arm64 - linux/ppc64le - linux/s390x - description: List of platforms to build the container images on. The available set of values is determined by the configuration of the multi-platform-controller. + description: List of platforms to build the container images on. The available + set of values is determined by the configuration of the multi-platform-controller. name: build-platforms type: array - default: --all-projects --org=3e1a4cca-ebfb-495f-b64c-3cc960d566b4 --exclude=test*,vendor,third_party @@ -45,7 +32,8 @@ spec: name: build-source-image type: string - default: "false" - description: 'Enable in-development package managers. WARNING: the behavior may change at any time without notice. Use at your own risk.' + description: 'Enable in-development package managers. WARNING: the behavior may + change at any time without notice. Use at your own risk.' name: prefetch-input-dev-package-managers - default: [] description: Additional image tags @@ -62,11 +50,13 @@ spec: name: output-image type: string - default: . - description: Path to the source code of an application's component from where to build image. + description: Path to the source code of an application's component from where + to build image. name: path-context type: string - default: Dockerfile - description: Path to the Dockerfile inside the context specified by parameter path-context + description: Path to the Dockerfile inside the context specified by parameter + path-context name: dockerfile type: string - default: "false" @@ -82,16 +72,23 @@ spec: name: hermetic type: string - default: "" - description: Build dependencies to be prefetched by Cachi2 + description: Build dependencies to be prefetched name: prefetch-input type: string - default: "" - description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively. + description: Image tag expiration time, time values could be something like 1h, + 2d, 3w for hours, days, and weeks, respectively. name: image-expires-after + type: string - default: "true" description: Add built image into an OCI image index name: build-image-index type: string + - default: docker + description: The format for the resulting image's mediaType. Valid values are + oci or docker. + name: buildah-format + type: string - default: [] description: Array of --build-arg values ("arg=value" strings) for buildah name: build-args @@ -101,7 +98,8 @@ spec: name: build-args-file type: string - default: "false" - description: Whether to enable privileged mode, should be used only with remote VMs + description: Whether to enable privileged mode, should be used only with remote + VMs name: privileged-nested type: string results: @@ -267,6 +265,10 @@ spec: value: $(params.build-args-file) - name: PRIVILEGED_NESTED value: $(params.privileged-nested) + - name: SOURCE_URL + value: $(tasks.clone-repository.results.url) + - name: BUILDAH_FORMAT + value: $(params.buildah-format) - name: SOURCE_ARTIFACT value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT) - name: CACHI2_ARTIFACT @@ -302,6 +304,8 @@ spec: - name: IMAGES value: - $(tasks.build-images.results.IMAGE_REF[*]) + - name: BUILDAH_FORMAT + value: $(params.buildah-format) runAfter: - build-images taskRef: @@ -322,12 +326,12 @@ spec: params: - name: BINARY_IMAGE value: $(tasks.build-image-index.results.IMAGE_URL) + - name: BINARY_IMAGE_DIGEST + value: $(tasks.build-image-index.results.IMAGE_DIGEST) - name: SOURCE_ARTIFACT value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT) - name: CACHI2_ARTIFACT value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT) - - name: BINARY_IMAGE_DIGEST - value: $(tasks.build-image-index.results.IMAGE_DIGEST) runAfter: - build-image-index taskRef: @@ -370,7 +374,12 @@ spec: operator: in values: - "false" - - name: clair-scan + - matrix: + params: + - name: image-platform + value: + - $(params.build-platforms) + name: clair-scan params: - name: image-digest value: $(tasks.build-image-index.results.IMAGE_DIGEST) @@ -392,7 +401,12 @@ spec: operator: in values: - "false" - - name: ecosystem-cert-preflight-checks + - matrix: + params: + - name: platform + value: + - $(params.build-platforms) + name: ecosystem-cert-preflight-checks params: - name: image-url value: $(tasks.build-image-index.results.IMAGE_URL) @@ -412,12 +426,12 @@ spec: operator: in values: - "false" - matrix: + - matrix: params: - - name: platform + - name: image-arch value: - $(params.build-platforms) - - name: clamav-scan + name: clamav-scan params: - name: image-digest value: $(tasks.build-image-index.results.IMAGE_DIGEST) @@ -439,11 +453,6 @@ spec: operator: in values: - "false" - matrix: - params: - - name: image-arch - value: - - $(params.build-platforms) - name: sast-shell-check params: - name: image-digest @@ -532,7 +541,7 @@ spec: - name: name value: rpms-signature-scan - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:1b6c20ab3dbfb0972803d3ebcb2fa72642e59400c77bd66dfd82028bdd09e120 + value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:06977232e67509e5540528ff6c3b081b23fc5bf3e40fb3e2d09a086d5c3243fc - name: kind value: task resolver: bundles diff --git a/.tekton/kn-plugin-func-func-util-115-pull-request.yaml b/.tekton/kn-plugin-func-func-util-115-pull-request.yaml index 239114ef31..096e196c08 100755 --- a/.tekton/kn-plugin-func-func-util-115-pull-request.yaml +++ b/.tekton/kn-plugin-func-func-util-115-pull-request.yaml @@ -25,7 +25,7 @@ spec: - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21 - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime - - VERSION=1.35.1 + - VERSION=1.35.2 - name: git-url value: '{{source_url}}' - name: hermetic diff --git a/.tekton/kn-plugin-func-func-util-115-push.yaml b/.tekton/kn-plugin-func-func-util-115-push.yaml index 978ae1ad0d..bd2f0b3bce 100755 --- a/.tekton/kn-plugin-func-func-util-115-push.yaml +++ b/.tekton/kn-plugin-func-func-util-115-push.yaml @@ -24,7 +24,7 @@ spec: - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21 - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime - - VERSION=1.35.1 + - VERSION=1.35.2 - name: git-url value: '{{source_url}}' - name: hermetic @@ -36,7 +36,7 @@ spec: - name: additional-tags value: - $(context.pipelineRun.uid)-{{revision}} - - 1.35.1 + - 1.35.2 - latest - name: prefetch-input value: '[{"type":"rpm"},{"path":".","type":"gomod"}]'