Skip to content

Commit 2ac5e4d

Browse files
fix: enable ALLOW_CROSS_PLATFORM_IMAGES and align task digests with #781
Set ALLOW_CROSS_PLATFORM_IMAGES=true on build-images so arm64 builds tolerate amd64-only vendor stages. Sync all Konflux task digests to MintMaker #781. Signed-off-by: Happy Bhati <hbhati@redhat.com> Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent bc9ba8a commit 2ac5e4d

2 files changed

Lines changed: 20 additions & 16 deletions

File tree

.tekton/release-service-utils-standalone-pull-request.yaml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ spec:
171171
- name: name
172172
value: git-clone-oci-ta
173173
- name: bundle
174-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:d30f13dd15daf89dd6dc645243b3444d35570d13f7840c3fd65e366022515205
174+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.2@sha256:52827a47564514f6accab971b8fad4f1c1cf59997507ed7c4e534615eeeae567
175175
- name: kind
176176
value: task
177177
resolver: bundles
@@ -197,7 +197,7 @@ spec:
197197
- name: name
198198
value: prefetch-dependencies-oci-ta
199199
- name: bundle
200-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:7e84b01526b6a50b920c0f456c8d95d6c5c2f7b81109ea772e1dcf7aba14bfa5
200+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:92956e75cd4714286f9c0c043f5301d1c0df1d750884edeceee87e0a91cc1975
201201
- name: kind
202202
value: task
203203
resolver: bundles
@@ -231,14 +231,16 @@ spec:
231231
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
232232
- name: BUILDAH_FORMAT
233233
value: $(params.buildah-format)
234+
- name: ALLOW_CROSS_PLATFORM_IMAGES
235+
value: "true"
234236
runAfter:
235237
- prefetch-dependencies
236238
taskRef:
237239
params:
238240
- name: name
239241
value: buildah-remote-oci-ta
240242
- name: bundle
241-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.10@sha256:1eaac50bb7e77feccfe3f0a521714de6a153387d3847bd94542e2a974bb05121
243+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.10@sha256:ae1b7a3010b37c55b7702de7a9d3ab61410f7931d1a77f15b3809395d31a9346
242244
- name: kind
243245
value: task
244246
resolver: bundles
@@ -260,7 +262,7 @@ spec:
260262
- name: name
261263
value: build-image-index
262264
- name: bundle
263-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.3@sha256:b33bfa8dc27dbf459f0779598ba45dcaa490bcc9f8efe1652bcf360ec8cb5582
265+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.3@sha256:0b4251ea0fab38be2b1441bea2788220d4cf2963ffb854a0ed90992fbabbe122
264266
- name: kind
265267
value: task
266268
resolver: bundles
@@ -281,7 +283,7 @@ spec:
281283
- name: name
282284
value: source-build-oci-ta
283285
- name: bundle
284-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:8567bb7bf8fa9147c96b297533336fa7079ecf972cb86c09ccdd6bddedb25711
286+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:d8115c74aed42fe9b1b3df149c534ced09f33c7bc6e51449bcaf8ec50699b8a0
285287
- name: kind
286288
value: task
287289
resolver: bundles
@@ -330,7 +332,7 @@ spec:
330332
- name: name
331333
value: clair-scan
332334
- name: bundle
333-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:8fad4c2e2f470f82ee43d6b2ac72327b4d9c6e9cb514a678911c1c9359c29894
335+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:312fb4d135e351bde38bcb14a7897b238d0aac19703b4e507c105f12b57836f1
334336
- name: kind
335337
value: task
336338
resolver: bundles
@@ -354,7 +356,7 @@ spec:
354356
- name: name
355357
value: sast-snyk-check
356358
- name: bundle
357-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.5@sha256:2a61c29aacfb9dfe68c114eb17caa2714af2f734c94ee3ad0c236f198b54809b
359+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.5@sha256:5c0f322c3b46577008d3a29ad34f84ea628ec7fc4825e92aa213e945bf31af81
358360
- name: kind
359361
value: task
360362
resolver: bundles
@@ -460,7 +462,7 @@ spec:
460462
- name: name
461463
value: rpms-signature-scan
462464
- name: bundle
463-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:a542b5a0e7dd76521d85222c22a122ba7bda8517033df7b3aa1da1ff7028f798
465+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:65370ccb44ff82e4ce128addd913f3c96b298607b3760ee1339ed10011a4bd6b
464466
- name: kind
465467
value: task
466468
resolver: bundles

.tekton/release-service-utils-standalone-push.yaml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ spec:
164164
- name: name
165165
value: git-clone-oci-ta
166166
- name: bundle
167-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:d30f13dd15daf89dd6dc645243b3444d35570d13f7840c3fd65e366022515205
167+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.2@sha256:52827a47564514f6accab971b8fad4f1c1cf59997507ed7c4e534615eeeae567
168168
- name: kind
169169
value: task
170170
resolver: bundles
@@ -190,7 +190,7 @@ spec:
190190
- name: name
191191
value: prefetch-dependencies-oci-ta
192192
- name: bundle
193-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:7e84b01526b6a50b920c0f456c8d95d6c5c2f7b81109ea772e1dcf7aba14bfa5
193+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:92956e75cd4714286f9c0c043f5301d1c0df1d750884edeceee87e0a91cc1975
194194
- name: kind
195195
value: task
196196
resolver: bundles
@@ -224,14 +224,16 @@ spec:
224224
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
225225
- name: BUILDAH_FORMAT
226226
value: $(params.buildah-format)
227+
- name: ALLOW_CROSS_PLATFORM_IMAGES
228+
value: "true"
227229
runAfter:
228230
- prefetch-dependencies
229231
taskRef:
230232
params:
231233
- name: name
232234
value: buildah-remote-oci-ta
233235
- name: bundle
234-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.10@sha256:1eaac50bb7e77feccfe3f0a521714de6a153387d3847bd94542e2a974bb05121
236+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.10@sha256:ae1b7a3010b37c55b7702de7a9d3ab61410f7931d1a77f15b3809395d31a9346
235237
- name: kind
236238
value: task
237239
resolver: bundles
@@ -253,7 +255,7 @@ spec:
253255
- name: name
254256
value: build-image-index
255257
- name: bundle
256-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.3@sha256:b33bfa8dc27dbf459f0779598ba45dcaa490bcc9f8efe1652bcf360ec8cb5582
258+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.3@sha256:0b4251ea0fab38be2b1441bea2788220d4cf2963ffb854a0ed90992fbabbe122
257259
- name: kind
258260
value: task
259261
resolver: bundles
@@ -274,7 +276,7 @@ spec:
274276
- name: name
275277
value: source-build-oci-ta
276278
- name: bundle
277-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:8567bb7bf8fa9147c96b297533336fa7079ecf972cb86c09ccdd6bddedb25711
279+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:d8115c74aed42fe9b1b3df149c534ced09f33c7bc6e51449bcaf8ec50699b8a0
278280
- name: kind
279281
value: task
280282
resolver: bundles
@@ -323,7 +325,7 @@ spec:
323325
- name: name
324326
value: clair-scan
325327
- name: bundle
326-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:8fad4c2e2f470f82ee43d6b2ac72327b4d9c6e9cb514a678911c1c9359c29894
328+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:312fb4d135e351bde38bcb14a7897b238d0aac19703b4e507c105f12b57836f1
327329
- name: kind
328330
value: task
329331
resolver: bundles
@@ -347,7 +349,7 @@ spec:
347349
- name: name
348350
value: sast-snyk-check
349351
- name: bundle
350-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.5@sha256:2a61c29aacfb9dfe68c114eb17caa2714af2f734c94ee3ad0c236f198b54809b
352+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.5@sha256:5c0f322c3b46577008d3a29ad34f84ea628ec7fc4825e92aa213e945bf31af81
351353
- name: kind
352354
value: task
353355
resolver: bundles
@@ -453,7 +455,7 @@ spec:
453455
- name: name
454456
value: rpms-signature-scan
455457
- name: bundle
456-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:a542b5a0e7dd76521d85222c22a122ba7bda8517033df7b3aa1da1ff7028f798
458+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:65370ccb44ff82e4ce128addd913f3c96b298607b3760ee1339ed10011a4bd6b
457459
- name: kind
458460
value: task
459461
resolver: bundles

0 commit comments

Comments
 (0)