Skip to content

Commit f2a444c

Browse files
author
serverless-qe
committed
[release-v1.16] Sync Konflux configurations
1 parent a60f77d commit f2a444c

File tree

2 files changed

+74
-78
lines changed

2 files changed

+74
-78
lines changed

.tekton/docker-build.yaml

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apiVersion: tekton.dev/v1
22
kind: Pipeline
33
metadata:
4-
creationTimestamp:
54
labels:
65
pipelines.openshift.io/runtime: generic
76
pipelines.openshift.io/strategy: docker
@@ -13,27 +12,14 @@ spec:
1312
1413
_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.
1514
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
3015
params:
3116
- default:
3217
- linux/x86_64
3318
- linux/arm64
3419
- linux/ppc64le
3520
- linux/s390x
36-
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.
21+
description: List of platforms to build the container images on. The available
22+
set of values is determined by the configuration of the multi-platform-controller.
3723
name: build-platforms
3824
type: array
3925
- default: --all-projects --org=3e1a4cca-ebfb-495f-b64c-3cc960d566b4 --exclude=test*,vendor,third_party
@@ -45,7 +31,8 @@ spec:
4531
name: build-source-image
4632
type: string
4733
- default: "false"
48-
description: 'Enable in-development package managers. WARNING: the behavior may change at any time without notice. Use at your own risk.'
34+
description: 'Enable in-development package managers. WARNING: the behavior may
35+
change at any time without notice. Use at your own risk.'
4936
name: prefetch-input-dev-package-managers
5037
- default: []
5138
description: Additional image tags
@@ -62,11 +49,13 @@ spec:
6249
name: output-image
6350
type: string
6451
- default: .
65-
description: Path to the source code of an application's component from where to build image.
52+
description: Path to the source code of an application's component from where
53+
to build image.
6654
name: path-context
6755
type: string
6856
- default: Dockerfile
69-
description: Path to the Dockerfile inside the context specified by parameter path-context
57+
description: Path to the Dockerfile inside the context specified by parameter
58+
path-context
7059
name: dockerfile
7160
type: string
7261
- default: "false"
@@ -82,17 +71,26 @@ spec:
8271
name: hermetic
8372
type: string
8473
- default: ""
85-
description: Build dependencies to be prefetched by Cachi2
74+
description: Build dependencies to be prefetched
8675
name: prefetch-input
8776
type: string
8877
- default: ""
89-
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
78+
description: Image tag expiration time, time values could be something like 1h,
79+
2d, 3w for hours, days, and weeks, respectively.
9080
name: image-expires-after
9181
type: string
9282
- default: "true"
9383
description: Add built image into an OCI image index
9484
name: build-image-index
9585
type: string
86+
- default: docker
87+
description: The format for the resulting image's mediaType. Valid values are
88+
oci or docker.
89+
name: buildah-format
90+
type: string
91+
- default: "false"
92+
description: Enable cache proxy configuration
93+
name: enable-cache-proxy
9694
- default: []
9795
description: Array of --build-arg values ("arg=value" strings) for buildah
9896
name: build-args
@@ -102,17 +100,10 @@ spec:
102100
name: build-args-file
103101
type: string
104102
- default: "false"
105-
description: Whether to enable privileged mode, should be used only with remote VMs
103+
description: Whether to enable privileged mode, should be used only with remote
104+
VMs
106105
name: privileged-nested
107106
type: string
108-
- name: buildah-format
109-
default: docker
110-
type: string
111-
description: The format for the resulting image's mediaType. Valid values are oci or docker.
112-
- name: enable-cache-proxy
113-
default: 'false'
114-
description: Enable cache proxy configuration
115-
type: string
116107
results:
117108
- description: ""
118109
name: IMAGE_URL
@@ -278,18 +269,20 @@ spec:
278269
value: $(params.build-args-file)
279270
- name: PRIVILEGED_NESTED
280271
value: $(params.privileged-nested)
281-
- name: SOURCE_ARTIFACT
282-
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
283-
- name: CACHI2_ARTIFACT
284-
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
285-
- name: IMAGE_APPEND_PLATFORM
286-
value: "true"
272+
- name: SOURCE_URL
273+
value: $(tasks.clone-repository.results.url)
287274
- name: BUILDAH_FORMAT
288275
value: $(params.buildah-format)
289276
- name: HTTP_PROXY
290277
value: $(tasks.init.results.http-proxy)
291278
- name: NO_PROXY
292279
value: $(tasks.init.results.no-proxy)
280+
- name: SOURCE_ARTIFACT
281+
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
282+
- name: CACHI2_ARTIFACT
283+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
284+
- name: IMAGE_APPEND_PLATFORM
285+
value: "true"
293286
runAfter:
294287
- prefetch-dependencies
295288
taskRef:
@@ -416,7 +409,12 @@ spec:
416409
operator: in
417410
values:
418411
- "false"
419-
- name: ecosystem-cert-preflight-checks
412+
- matrix:
413+
params:
414+
- name: platform
415+
value:
416+
- $(params.build-platforms)
417+
name: ecosystem-cert-preflight-checks
420418
params:
421419
- name: image-url
422420
value: $(tasks.build-image-index.results.IMAGE_URL)
@@ -551,7 +549,7 @@ spec:
551549
- name: name
552550
value: rpms-signature-scan
553551
- name: bundle
554-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:06977232e67509e5540528ff6c3b081b23fc5bf3e40fb3e2d09a086d5c3243fc
552+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:c02429b45145fc7f2b1fa94ec2f48c0d8ac203fd4385796b4c93e5d0dec967f8
555553
- name: kind
556554
value: task
557555
resolver: bundles

.tekton/docker-java-build.yaml

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apiVersion: tekton.dev/v1
22
kind: Pipeline
33
metadata:
4-
creationTimestamp:
54
labels:
65
pipelines.openshift.io/runtime: generic
76
pipelines.openshift.io/strategy: docker
@@ -13,27 +12,14 @@ spec:
1312
1413
_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.
1514
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
3015
params:
3116
- default:
3217
- linux/x86_64
3318
- linux/arm64
3419
- linux/ppc64le
3520
- linux/s390x
36-
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.
21+
description: List of platforms to build the container images on. The available
22+
set of values is determined by the configuration of the multi-platform-controller.
3723
name: build-platforms
3824
type: array
3925
- default: --all-projects --org=3e1a4cca-ebfb-495f-b64c-3cc960d566b4 --exclude=test*,vendor,third_party
@@ -45,7 +31,8 @@ spec:
4531
name: build-source-image
4632
type: string
4733
- default: "false"
48-
description: 'Enable in-development package managers. WARNING: the behavior may change at any time without notice. Use at your own risk.'
34+
description: 'Enable in-development package managers. WARNING: the behavior may
35+
change at any time without notice. Use at your own risk.'
4936
name: prefetch-input-dev-package-managers
5037
- default: []
5138
description: Additional image tags
@@ -62,11 +49,13 @@ spec:
6249
name: output-image
6350
type: string
6451
- default: .
65-
description: Path to the source code of an application's component from where to build image.
52+
description: Path to the source code of an application's component from where
53+
to build image.
6654
name: path-context
6755
type: string
6856
- default: Dockerfile
69-
description: Path to the Dockerfile inside the context specified by parameter path-context
57+
description: Path to the Dockerfile inside the context specified by parameter
58+
path-context
7059
name: dockerfile
7160
type: string
7261
- default: "false"
@@ -82,17 +71,26 @@ spec:
8271
name: hermetic
8372
type: string
8473
- default: ""
85-
description: Build dependencies to be prefetched by Cachi2
74+
description: Build dependencies to be prefetched
8675
name: prefetch-input
8776
type: string
8877
- default: ""
89-
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
78+
description: Image tag expiration time, time values could be something like 1h,
79+
2d, 3w for hours, days, and weeks, respectively.
9080
name: image-expires-after
9181
type: string
9282
- default: "true"
9383
description: Add built image into an OCI image index
9484
name: build-image-index
9585
type: string
86+
- default: docker
87+
description: The format for the resulting image's mediaType. Valid values are
88+
oci or docker.
89+
name: buildah-format
90+
type: string
91+
- default: "false"
92+
description: Enable cache proxy configuration
93+
name: enable-cache-proxy
9694
- default: []
9795
description: Array of --build-arg values ("arg=value" strings) for buildah
9896
name: build-args
@@ -102,17 +100,10 @@ spec:
102100
name: build-args-file
103101
type: string
104102
- default: "false"
105-
description: Whether to enable privileged mode, should be used only with remote VMs
103+
description: Whether to enable privileged mode, should be used only with remote
104+
VMs
106105
name: privileged-nested
107106
type: string
108-
- name: buildah-format
109-
default: docker
110-
type: string
111-
description: The format for the resulting image's mediaType. Valid values are oci or docker.
112-
- name: enable-cache-proxy
113-
default: 'false'
114-
description: Enable cache proxy configuration
115-
type: string
116107
results:
117108
- description: ""
118109
name: IMAGE_URL
@@ -159,10 +150,6 @@ spec:
159150
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
160151
- name: IMAGE_APPEND_PLATFORM
161152
value: "true"
162-
- name: HTTP_PROXY
163-
value: $(tasks.init.results.http-proxy)
164-
- name: NO_PROXY
165-
value: $(tasks.init.results.no-proxy)
166153
runAfter:
167154
- prefetch-dependencies
168155
taskRef:
@@ -237,16 +224,20 @@ spec:
237224
value: $(params.build-args-file)
238225
- name: PRIVILEGED_NESTED
239226
value: $(params.privileged-nested)
227+
- name: SOURCE_URL
228+
value: $(tasks.clone-repository.results.url)
229+
- name: BUILDAH_FORMAT
230+
value: $(params.buildah-format)
231+
- name: HTTP_PROXY
232+
value: $(tasks.init.results.http-proxy)
233+
- name: NO_PROXY
234+
value: $(tasks.init.results.no-proxy)
240235
- name: SOURCE_ARTIFACT
241236
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
242237
- name: CACHI2_ARTIFACT
243238
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
244239
- name: IMAGE_APPEND_PLATFORM
245240
value: "true"
246-
- name: HTTP_PROXY
247-
value: $(tasks.init.results.http-proxy)
248-
- name: NO_PROXY
249-
value: $(tasks.init.results.no-proxy)
250241
runAfter:
251242
- build-image-index-deps
252243
taskRef:
@@ -399,6 +390,8 @@ spec:
399390
- name: IMAGES
400391
value:
401392
- $(tasks.build-images.results.IMAGE_REF[*])
393+
- name: BUILDAH_FORMAT
394+
value: $(params.buildah-format)
402395
runAfter:
403396
- build-images
404397
taskRef:
@@ -494,7 +487,12 @@ spec:
494487
operator: in
495488
values:
496489
- "false"
497-
- name: ecosystem-cert-preflight-checks
490+
- matrix:
491+
params:
492+
- name: platform
493+
value:
494+
- $(params.build-platforms)
495+
name: ecosystem-cert-preflight-checks
498496
params:
499497
- name: image-url
500498
value: $(tasks.build-image-index.results.IMAGE_URL)
@@ -629,7 +627,7 @@ spec:
629627
- name: name
630628
value: rpms-signature-scan
631629
- name: bundle
632-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:06977232e67509e5540528ff6c3b081b23fc5bf3e40fb3e2d09a086d5c3243fc
630+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:c02429b45145fc7f2b1fa94ec2f48c0d8ac203fd4385796b4c93e5d0dec967f8
633631
- name: kind
634632
value: task
635633
resolver: bundles

0 commit comments

Comments
 (0)