Skip to content

Commit 2379626

Browse files
author
red-hat-konflux-kflux-prd-rh03
committed
Red Hat Konflux kflux-prd-rh03 update kola-targetcli
Signed-off-by: red-hat-konflux-kflux-prd-rh03 <konflux@no-reply.konflux-ci.dev>
1 parent 58c1a2a commit 2379626

2 files changed

Lines changed: 50 additions & 18 deletions

File tree

.tekton/kola-targetcli-pull-request.yaml

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,19 @@ spec:
2727
value: quay.io/redhat-user-workloads/coreos-tenant/kola-targetcli:on-pr-{{revision}}
2828
- name: image-expires-after
2929
value: 5d
30+
- name: build-platforms
31+
value:
32+
- linux/x86_64
3033
- name: dockerfile
3134
value: ./tests/containers/targetcli/Containerfile
3235
- name: path-context
3336
value: .
3437
pipelineSpec:
3538
description: |
36-
This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.
39+
This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.
3740
38-
_Uses `buildah` to create a 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. 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.
39-
This pipeline is pushed as a Tekton bundle to [quay.io](https://quay.io/repository/konflux-ci/tekton-catalog/pipeline-docker-build-oci-ta?tab=tags)_
41+
_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.
42+
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)_
4043
finally:
4144
- name: show-sbom
4245
params:
@@ -96,7 +99,7 @@ spec:
9699
description: Build a source image.
97100
name: build-source-image
98101
type: string
99-
- default: "false"
102+
- default: "true"
100103
description: Add built image into an OCI image index
101104
name: build-image-index
102105
type: string
@@ -113,6 +116,12 @@ spec:
113116
VMs
114117
name: privileged-nested
115118
type: string
119+
- default:
120+
- linux/x86_64
121+
description: List of platforms to build the container images on. The available
122+
set of values is determined by the configuration of the multi-platform-controller.
123+
name: build-platforms
124+
type: array
116125
results:
117126
- description: ""
118127
name: IMAGE_URL
@@ -199,7 +208,12 @@ spec:
199208
workspace: git-auth
200209
- name: netrc
201210
workspace: netrc
202-
- name: build-container
211+
- matrix:
212+
params:
213+
- name: PLATFORM
214+
value:
215+
- $(params.build-platforms)
216+
name: build-images
203217
params:
204218
- name: IMAGE
205219
value: $(params.output-image)
@@ -226,14 +240,16 @@ spec:
226240
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
227241
- name: CACHI2_ARTIFACT
228242
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
243+
- name: IMAGE_APPEND_PLATFORM
244+
value: "true"
229245
runAfter:
230246
- prefetch-dependencies
231247
taskRef:
232248
params:
233249
- name: name
234-
value: buildah-oci-ta
250+
value: buildah-remote-oci-ta
235251
- name: bundle
236-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.4@sha256:09f012a6c726c66922703f28846a3cfa196e8a391729192cda0d8f8a757b6ff5
252+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:cfeeef2f4ab25b121afdf44eecc394ed67f3534a1bd14bef9e7beef2ee654b8e
237253
- name: kind
238254
value: task
239255
resolver: bundles
@@ -254,9 +270,9 @@ spec:
254270
value: $(params.build-image-index)
255271
- name: IMAGES
256272
value:
257-
- $(tasks.build-container.results.IMAGE_URL)@$(tasks.build-container.results.IMAGE_DIGEST)
273+
- $(tasks.build-images.results.IMAGE_REF[*])
258274
runAfter:
259-
- build-container
275+
- build-images
260276
taskRef:
261277
params:
262278
- name: name

.tekton/kola-targetcli-push.yaml

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,19 @@ spec:
2424
value: '{{revision}}'
2525
- name: output-image
2626
value: quay.io/redhat-user-workloads/coreos-tenant/kola-targetcli:{{revision}}
27+
- name: build-platforms
28+
value:
29+
- linux/x86_64
2730
- name: dockerfile
2831
value: ./tests/containers/targetcli/Containerfile
2932
- name: path-context
3033
value: .
3134
pipelineSpec:
3235
description: |
33-
This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.
36+
This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.
3437
35-
_Uses `buildah` to create a 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. 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.
36-
This pipeline is pushed as a Tekton bundle to [quay.io](https://quay.io/repository/konflux-ci/tekton-catalog/pipeline-docker-build-oci-ta?tab=tags)_
38+
_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.
39+
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)_
3740
finally:
3841
- name: show-sbom
3942
params:
@@ -93,7 +96,7 @@ spec:
9396
description: Build a source image.
9497
name: build-source-image
9598
type: string
96-
- default: "false"
99+
- default: "true"
97100
description: Add built image into an OCI image index
98101
name: build-image-index
99102
type: string
@@ -110,6 +113,12 @@ spec:
110113
VMs
111114
name: privileged-nested
112115
type: string
116+
- default:
117+
- linux/x86_64
118+
description: List of platforms to build the container images on. The available
119+
set of values is determined by the configuration of the multi-platform-controller.
120+
name: build-platforms
121+
type: array
113122
results:
114123
- description: ""
115124
name: IMAGE_URL
@@ -196,7 +205,12 @@ spec:
196205
workspace: git-auth
197206
- name: netrc
198207
workspace: netrc
199-
- name: build-container
208+
- matrix:
209+
params:
210+
- name: PLATFORM
211+
value:
212+
- $(params.build-platforms)
213+
name: build-images
200214
params:
201215
- name: IMAGE
202216
value: $(params.output-image)
@@ -223,14 +237,16 @@ spec:
223237
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
224238
- name: CACHI2_ARTIFACT
225239
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
240+
- name: IMAGE_APPEND_PLATFORM
241+
value: "true"
226242
runAfter:
227243
- prefetch-dependencies
228244
taskRef:
229245
params:
230246
- name: name
231-
value: buildah-oci-ta
247+
value: buildah-remote-oci-ta
232248
- name: bundle
233-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.4@sha256:09f012a6c726c66922703f28846a3cfa196e8a391729192cda0d8f8a757b6ff5
249+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:cfeeef2f4ab25b121afdf44eecc394ed67f3534a1bd14bef9e7beef2ee654b8e
234250
- name: kind
235251
value: task
236252
resolver: bundles
@@ -251,9 +267,9 @@ spec:
251267
value: $(params.build-image-index)
252268
- name: IMAGES
253269
value:
254-
- $(tasks.build-container.results.IMAGE_URL)@$(tasks.build-container.results.IMAGE_DIGEST)
270+
- $(tasks.build-images.results.IMAGE_REF[*])
255271
runAfter:
256-
- build-container
272+
- build-images
257273
taskRef:
258274
params:
259275
- name: name

0 commit comments

Comments
 (0)