Skip to content

Commit a73f045

Browse files
Discover new branches and update pipelines (#771)
Co-authored-by: Kaustubh-pande <Kaustubh-pande@users.noreply.github.com>
1 parent f0ba683 commit a73f045

7 files changed

Lines changed: 264 additions & 215 deletions

File tree

pkg/dockerfilegen/ubi8.rpms.lock.yaml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ arches:
1818
name: rsync
1919
evr: 3.1.3-23.el8_10
2020
sourcerpm: rsync-3.1.3-23.el8_10.src.rpm
21-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/t/tar-1.30-10.el8_10.aarch64.rpm
21+
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/t/tar-1.30-11.el8_10.aarch64.rpm
2222
repoid: ubi-8-for-aarch64-baseos-rpms
23-
size: 850208
24-
checksum: sha256:faa096f95002ea8d8b07b7456fc7bc6cb096d998b5cc5930a01534dc15e02abb
23+
size: 849436
24+
checksum: sha256:d144cdff236b71afbe4ce9a02919b9723b333c1588c887da781c1a74af56ad29
2525
name: tar
26-
evr: 2:1.30-10.el8_10
27-
sourcerpm: tar-1.30-10.el8_10.src.rpm
26+
evr: 2:1.30-11.el8_10
27+
sourcerpm: tar-1.30-11.el8_10.src.rpm
2828
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/t/tzdata-2025b-1.el8.noarch.rpm
2929
repoid: ubi-8-for-aarch64-baseos-rpms
3030
size: 488428
@@ -45,12 +45,12 @@ arches:
4545
checksum: sha256:f21aa8abbea6df3016d82d6db3e8b9abce2a068de40373d5ad6fa0926f0ca24a
4646
name: rsync
4747
evr: 3.1.3-23.el8_10
48-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/source/SRPMS/Packages/t/tar-1.30-10.el8_10.src.rpm
48+
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/source/SRPMS/Packages/t/tar-1.30-11.el8_10.src.rpm
4949
repoid: ubi-8-for-aarch64-baseos-source-rpms
50-
size: 2172709
51-
checksum: sha256:bf8f8a0c5c47b1a35b732c9e2b9afbd45171a70355f0b93526deb654ed55b566
50+
size: 2173356
51+
checksum: sha256:eda17923b1ada7f9d5f8a4501929a61e393b66cb0a6ade6ab13d85817d29f779
5252
name: tar
53-
evr: 2:1.30-10.el8_10
53+
evr: 2:1.30-11.el8_10
5454
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/source/SRPMS/Packages/t/tzdata-2025b-1.el8.src.rpm
5555
repoid: ubi-8-for-aarch64-baseos-source-rpms
5656
size: 946701
@@ -74,13 +74,13 @@ arches:
7474
name: rsync
7575
evr: 3.1.3-23.el8_10
7676
sourcerpm: rsync-3.1.3-23.el8_10.src.rpm
77-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/t/tar-1.30-10.el8_10.ppc64le.rpm
77+
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/t/tar-1.30-11.el8_10.ppc64le.rpm
7878
repoid: ubi-8-for-ppc64le-baseos-rpms
79-
size: 879004
80-
checksum: sha256:759b26009945a72d4d5813efcaf17d9ff2494f1031bcd57220acff067a33853e
79+
size: 877676
80+
checksum: sha256:8f7ab471dc80a164806bae0dab7c4a631383f8fb0c89ab34ac578dd2900ce979
8181
name: tar
82-
evr: 2:1.30-10.el8_10
83-
sourcerpm: tar-1.30-10.el8_10.src.rpm
82+
evr: 2:1.30-11.el8_10
83+
sourcerpm: tar-1.30-11.el8_10.src.rpm
8484
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/t/tzdata-2025b-1.el8.noarch.rpm
8585
repoid: ubi-8-for-ppc64le-baseos-rpms
8686
size: 488428
@@ -101,12 +101,12 @@ arches:
101101
checksum: sha256:f21aa8abbea6df3016d82d6db3e8b9abce2a068de40373d5ad6fa0926f0ca24a
102102
name: rsync
103103
evr: 3.1.3-23.el8_10
104-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/source/SRPMS/Packages/t/tar-1.30-10.el8_10.src.rpm
104+
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/source/SRPMS/Packages/t/tar-1.30-11.el8_10.src.rpm
105105
repoid: ubi-8-for-ppc64le-baseos-source-rpms
106-
size: 2172709
107-
checksum: sha256:bf8f8a0c5c47b1a35b732c9e2b9afbd45171a70355f0b93526deb654ed55b566
106+
size: 2173356
107+
checksum: sha256:eda17923b1ada7f9d5f8a4501929a61e393b66cb0a6ade6ab13d85817d29f779
108108
name: tar
109-
evr: 2:1.30-10.el8_10
109+
evr: 2:1.30-11.el8_10
110110
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/source/SRPMS/Packages/t/tzdata-2025b-1.el8.src.rpm
111111
repoid: ubi-8-for-ppc64le-baseos-source-rpms
112112
size: 946701
@@ -130,13 +130,13 @@ arches:
130130
name: rsync
131131
evr: 3.1.3-23.el8_10
132132
sourcerpm: rsync-3.1.3-23.el8_10.src.rpm
133-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/t/tar-1.30-10.el8_10.s390x.rpm
133+
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/t/tar-1.30-11.el8_10.s390x.rpm
134134
repoid: ubi-8-for-s390x-baseos-rpms
135-
size: 853692
136-
checksum: sha256:783728be13c9e911d2d899b49b8b9be51723359078e8593c7475aeb506b350af
135+
size: 852716
136+
checksum: sha256:19658f59ed89e790423c0639d1bd39158e7fb20d86aef49765e81878708053ad
137137
name: tar
138-
evr: 2:1.30-10.el8_10
139-
sourcerpm: tar-1.30-10.el8_10.src.rpm
138+
evr: 2:1.30-11.el8_10
139+
sourcerpm: tar-1.30-11.el8_10.src.rpm
140140
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/t/tzdata-2025b-1.el8.noarch.rpm
141141
repoid: ubi-8-for-s390x-baseos-rpms
142142
size: 488428
@@ -157,12 +157,12 @@ arches:
157157
checksum: sha256:f21aa8abbea6df3016d82d6db3e8b9abce2a068de40373d5ad6fa0926f0ca24a
158158
name: rsync
159159
evr: 3.1.3-23.el8_10
160-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/source/SRPMS/Packages/t/tar-1.30-10.el8_10.src.rpm
160+
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/source/SRPMS/Packages/t/tar-1.30-11.el8_10.src.rpm
161161
repoid: ubi-8-for-s390x-baseos-source-rpms
162-
size: 2172709
163-
checksum: sha256:bf8f8a0c5c47b1a35b732c9e2b9afbd45171a70355f0b93526deb654ed55b566
162+
size: 2173356
163+
checksum: sha256:eda17923b1ada7f9d5f8a4501929a61e393b66cb0a6ade6ab13d85817d29f779
164164
name: tar
165-
evr: 2:1.30-10.el8_10
165+
evr: 2:1.30-11.el8_10
166166
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/source/SRPMS/Packages/t/tzdata-2025b-1.el8.src.rpm
167167
repoid: ubi-8-for-s390x-baseos-source-rpms
168168
size: 946701
@@ -186,13 +186,13 @@ arches:
186186
name: rsync
187187
evr: 3.1.3-23.el8_10
188188
sourcerpm: rsync-3.1.3-23.el8_10.src.rpm
189-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/t/tar-1.30-10.el8_10.x86_64.rpm
189+
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/t/tar-1.30-11.el8_10.x86_64.rpm
190190
repoid: ubi-8-for-x86_64-baseos-rpms
191-
size: 859244
192-
checksum: sha256:471485af8599f7176f357867dc952e587cffb223dec3455f97d8e40a854515ac
191+
size: 858044
192+
checksum: sha256:165490e87bdfb8c9647aeb58c72c1676c695218a8f87170753a9f49daabb774c
193193
name: tar
194-
evr: 2:1.30-10.el8_10
195-
sourcerpm: tar-1.30-10.el8_10.src.rpm
194+
evr: 2:1.30-11.el8_10
195+
sourcerpm: tar-1.30-11.el8_10.src.rpm
196196
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/t/tzdata-2025b-1.el8.noarch.rpm
197197
repoid: ubi-8-for-x86_64-baseos-rpms
198198
size: 488428
@@ -213,12 +213,12 @@ arches:
213213
checksum: sha256:f21aa8abbea6df3016d82d6db3e8b9abce2a068de40373d5ad6fa0926f0ca24a
214214
name: rsync
215215
evr: 3.1.3-23.el8_10
216-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/source/SRPMS/Packages/t/tar-1.30-10.el8_10.src.rpm
216+
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/source/SRPMS/Packages/t/tar-1.30-11.el8_10.src.rpm
217217
repoid: ubi-8-for-x86_64-baseos-source-rpms
218-
size: 2172709
219-
checksum: sha256:bf8f8a0c5c47b1a35b732c9e2b9afbd45171a70355f0b93526deb654ed55b566
218+
size: 2173356
219+
checksum: sha256:eda17923b1ada7f9d5f8a4501929a61e393b66cb0a6ade6ab13d85817d29f779
220220
name: tar
221-
evr: 2:1.30-10.el8_10
221+
evr: 2:1.30-11.el8_10
222222
- 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
223223
repoid: ubi-8-for-x86_64-baseos-source-rpms
224224
size: 946701

pkg/konfluxgen/bundle-build.yaml

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,6 @@ spec:
1313
1414
_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.
1515
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)_
16-
finally:
17-
- name: show-sbom
18-
params:
19-
- name: IMAGE_URL
20-
value: $(tasks.build-image-index.results.IMAGE_URL)
21-
taskRef:
22-
params:
23-
- name: name
24-
value: show-sbom
25-
- name: bundle
26-
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:beb0616db051952b4b861dd8c3e00fa1c0eccbd926feddf71194d3bb3ace9ce7
27-
- name: kind
28-
value: task
29-
resolver: bundles
3016
params:
3117
- default: "false"
3218
description: Add built image into an OCI image index
@@ -81,14 +67,19 @@ spec:
8167
name: hermetic
8268
type: string
8369
- default: ""
84-
description: Build dependencies to be prefetched by Cachi2
70+
description: Build dependencies to be prefetched
8571
name: prefetch-input
8672
type: string
8773
- default: ""
8874
description: Image tag expiration time, time values could be something like 1h,
8975
2d, 3w for hours, days, and weeks, respectively.
9076
name: image-expires-after
9177
type: string
78+
- default: docker
79+
description: The format for the resulting image's mediaType. Valid values are
80+
oci or docker.
81+
name: buildah-format
82+
type: string
9283
- default: []
9384
description: Array of --build-arg values ("arg=value" strings) for buildah
9485
name: build-args
@@ -152,6 +143,10 @@ spec:
152143
value: $(params.build-args-file)
153144
- name: PRIVILEGED_NESTED
154145
value: $(params.privileged-nested)
146+
- name: SOURCE_URL
147+
value: $(tasks.clone-repository.results.url)
148+
- name: BUILDAH_FORMAT
149+
value: $(params.buildah-format)
155150
- name: SOURCE_ARTIFACT
156151
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
157152
- name: CACHI2_ARTIFACT
@@ -163,7 +158,7 @@ spec:
163158
- name: name
164159
value: buildah-remote-oci-ta
165160
- name: bundle
166-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:133f78ffc883475262651744af912831cf19b49dddbd826ef64e2d4ab2e0af7b
161+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.5@sha256:5e59c05455619580f4383010726f7db8440ecf6959882e9053ac697dd6d277fd
167162
- name: kind
168163
value: task
169164
resolver: bundles
@@ -191,7 +186,7 @@ spec:
191186
- name: name
192187
value: sast-snyk-check-oci-ta
193188
- name: bundle
194-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:fe5e5ba3a72632cd505910de2eacd62c9d11ed570c325173188f8d568ac60771
189+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:181d63c126e3119a9d57b8feed4eb66a875b5208c3e90724c22758e65dca8733
195190
- name: kind
196191
value: task
197192
resolver: bundles
@@ -219,7 +214,7 @@ spec:
219214
- name: name
220215
value: prefetch-dependencies-oci-ta
221216
- name: bundle
222-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:125aea525bcdb31ff86cb37d56e3d8369587ead48da3bc454d4344682724ca54
217+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:dc82a7270aace9b1c26f7e96f8ccab2752e53d32980c41a45e1733baad76cde6
223218
- name: kind
224219
value: task
225220
resolver: bundles
@@ -243,7 +238,7 @@ spec:
243238
- name: name
244239
value: apply-tags
245240
- name: bundle
246-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:264fa9591929fb60e3aca033ff168e5d98b1aafb458d6988e327a99ff494b00b
241+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:f44be1bf0262471f2f503f5e19da5f0628dcaf968c86272a2ad6b4871e708448
247242
- name: kind
248243
value: task
249244
resolver: bundles
@@ -260,7 +255,7 @@ spec:
260255
- name: name
261256
value: init
262257
- name: bundle
263-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:08e18a4dc5f947c1d20e8353a19d013144bea87b72f67236b165dd4778523951
258+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:bbf313b09740fb39b3343bc69ee94b2a2c21d16a9304f9b7c111c305558fc346
264259
- name: kind
265260
value: task
266261
resolver: bundles
@@ -281,7 +276,7 @@ spec:
281276
- name: name
282277
value: git-clone-oci-ta
283278
- name: bundle
284-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:be82c55346e8810bd1edc5547f864064da6945979baccca7dfc99990b392a02b
279+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:f21c34e50500edc84e4889d85fd71a80d79182b16c044adc7f5ecda021c6dfc7
285280
- name: kind
286281
value: task
287282
resolver: bundles
@@ -306,14 +301,16 @@ spec:
306301
- name: IMAGES
307302
value:
308303
- $(tasks.build-images.results.IMAGE_REF[*])
304+
- name: BUILDAH_FORMAT
305+
value: $(params.buildah-format)
309306
runAfter:
310307
- build-images
311308
taskRef:
312309
params:
313310
- name: name
314311
value: build-image-index
315312
- name: bundle
316-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:72f77a8c62f9d6f69ab5c35170839e4b190026e6cc3d7d4ceafa7033fc30ad7b
313+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:79784d53749584bc5a8de32142ec4e2f01cdbf42c20d94e59280e0b927c8597d
317314
- name: kind
318315
value: task
319316
resolver: bundles
@@ -339,7 +336,7 @@ spec:
339336
- name: name
340337
value: source-build-oci-ta
341338
- name: bundle
342-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:bfec1fabb0ed7c191e6c85d75e6cc577a04cabe9e6b35f9476529e8e5b3c0c82
339+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:36d44f2924f60da00a079a9ab7ce25ad8b2ad593c16d90509203c125ff0ccd46
343340
- name: kind
344341
value: task
345342
resolver: bundles
@@ -365,7 +362,7 @@ spec:
365362
- name: name
366363
value: deprecated-image-check
367364
- name: bundle
368-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:f485ef8bfdaf6e6d8d7795eb2e25f9c5ee8619d52220f4d64b5e28078d568c89
365+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:1d07d16810c26713f3d875083924d93697900147364360587ccb5a63f2c31012
369366
- name: kind
370367
value: task
371368
resolver: bundles
@@ -374,7 +371,12 @@ spec:
374371
operator: in
375372
values:
376373
- "false"
377-
- name: clair-scan
374+
- matrix:
375+
params:
376+
- name: image-platform
377+
value:
378+
- $(params.build-platforms)
379+
name: clair-scan
378380
params:
379381
- name: image-digest
380382
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -387,7 +389,7 @@ spec:
387389
- name: name
388390
value: clair-scan
389391
- name: bundle
390-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:417f44117f8d87a4a62fea6589b5746612ac61640b454dbd88f74892380411f2
392+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:a7cc183967f89c4ac100d04ab8f81e54733beee60a0528208107c9a22d3c43af
391393
- name: kind
392394
value: task
393395
resolver: bundles
@@ -414,7 +416,7 @@ spec:
414416
- name: name
415417
value: clamav-scan
416418
- name: bundle
417-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:cce2dfcc5bd6e91ee54aacdadad523b013eeae5cdaa7f6a4624b8cbcc040f439
419+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:b0bd59748cda4a7abf311e4f448e6c1d00c6b6d8c0ecc1c2eb33e08dc0e0b802
418420
- name: kind
419421
value: task
420422
resolver: bundles
@@ -466,7 +468,7 @@ spec:
466468
- name: name
467469
value: sast-unicode-check-oci-ta
468470
- name: bundle
469-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.2@sha256:3f99dc4634a62e1530324cd565d12323ca82be3cfa8a031a36b210becfa7b552
471+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:a2bde66f6b4164620298c7d709b8f08515409404000fa1dc2260d2508b135651
470472
- name: kind
471473
value: task
472474
resolver: bundles
@@ -494,7 +496,7 @@ spec:
494496
- name: name
495497
value: push-dockerfile-oci-ta
496498
- name: bundle
497-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:8640726ef7c5875e3b2e64c9f823921ea970674593f077cadfce3c45c9b9a2b9
499+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:2bc5b3afc5de56da0f06eac60b65e86f6b861b16a63f48579fc0bac7d657e14c
498500
- name: kind
499501
value: task
500502
resolver: bundles
@@ -511,7 +513,7 @@ spec:
511513
- name: name
512514
value: rpms-signature-scan
513515
- name: bundle
514-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:7d1c087d7d33dd97effb3b4c9f3788e4c3138da2032040d69da6929e9a3aaceb
516+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:06977232e67509e5540528ff6c3b081b23fc5bf3e40fb3e2d09a086d5c3243fc
515517
- name: kind
516518
value: task
517519
resolver: bundles

0 commit comments

Comments
 (0)