Skip to content

Commit a4f9550

Browse files
author
red-hat-konflux-kflux-prd-rh03
committed
Red Hat Konflux kflux-prd-rh03 update kola-nfs
Signed-off-by: red-hat-konflux-kflux-prd-rh03 <konflux@no-reply.konflux-ci.dev>
1 parent 67a1fd0 commit a4f9550

2 files changed

Lines changed: 50 additions & 18 deletions

File tree

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

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,19 @@ spec:
2828
value: quay.io/redhat-user-workloads/coreos-tenant/kola-nfs:on-pr-{{revision}}
2929
- name: image-expires-after
3030
value: 5d
31+
- name: build-platforms
32+
value:
33+
- linux/x86_64
3134
- name: dockerfile
3235
value: Containerfile
3336
- name: path-context
3437
value: tests/containers/nfs
3538
pipelineSpec:
3639
description: |
37-
This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.
40+
This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.
3841
39-
_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.
40-
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)_
42+
_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.
43+
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)_
4144
finally:
4245
- name: show-sbom
4346
params:
@@ -97,7 +100,7 @@ spec:
97100
description: Build a source image.
98101
name: build-source-image
99102
type: string
100-
- default: "false"
103+
- default: "true"
101104
description: Add built image into an OCI image index
102105
name: build-image-index
103106
type: string
@@ -114,6 +117,12 @@ spec:
114117
VMs
115118
name: privileged-nested
116119
type: string
120+
- default:
121+
- linux/x86_64
122+
description: List of platforms to build the container images on. The available
123+
set of values is determined by the configuration of the multi-platform-controller.
124+
name: build-platforms
125+
type: array
117126
results:
118127
- description: ""
119128
name: IMAGE_URL
@@ -200,7 +209,12 @@ spec:
200209
workspace: git-auth
201210
- name: netrc
202211
workspace: netrc
203-
- name: build-container
212+
- matrix:
213+
params:
214+
- name: PLATFORM
215+
value:
216+
- $(params.build-platforms)
217+
name: build-images
204218
params:
205219
- name: IMAGE
206220
value: $(params.output-image)
@@ -227,14 +241,16 @@ spec:
227241
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
228242
- name: CACHI2_ARTIFACT
229243
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
244+
- name: IMAGE_APPEND_PLATFORM
245+
value: "true"
230246
runAfter:
231247
- prefetch-dependencies
232248
taskRef:
233249
params:
234250
- name: name
235-
value: buildah-oci-ta
251+
value: buildah-remote-oci-ta
236252
- name: bundle
237-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.4@sha256:09f012a6c726c66922703f28846a3cfa196e8a391729192cda0d8f8a757b6ff5
253+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:cfeeef2f4ab25b121afdf44eecc394ed67f3534a1bd14bef9e7beef2ee654b8e
238254
- name: kind
239255
value: task
240256
resolver: bundles
@@ -255,9 +271,9 @@ spec:
255271
value: $(params.build-image-index)
256272
- name: IMAGES
257273
value:
258-
- $(tasks.build-container.results.IMAGE_URL)@$(tasks.build-container.results.IMAGE_DIGEST)
274+
- $(tasks.build-images.results.IMAGE_REF[*])
259275
runAfter:
260-
- build-container
276+
- build-images
261277
taskRef:
262278
params:
263279
- name: name

.tekton/kola-nfs-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-nfs:{{revision}}
27+
- name: build-platforms
28+
value:
29+
- linux/x86_64
2730
- name: dockerfile
2831
value: Containerfile
2932
- name: path-context
3033
value: tests/containers/nfs
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)