Skip to content

Commit 7b17d49

Browse files
author
serverless-qe
committed
[release-v1.19] Sync Konflux configurations
1 parent f5945bc commit 7b17d49

File tree

3 files changed

+38
-29
lines changed

3 files changed

+38
-29
lines changed

.tekton/docker-build.yaml

Lines changed: 24 additions & 17 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:
3218
- linux/x86_64
@@ -86,7 +72,7 @@ spec:
8672
name: hermetic
8773
type: string
8874
- default: ""
89-
description: Build dependencies to be prefetched by Cachi2
75+
description: Build dependencies to be prefetched
9076
name: prefetch-input
9177
type: string
9278
- default: ""
@@ -98,6 +84,11 @@ spec:
9884
description: Add built image into an OCI image index
9985
name: build-image-index
10086
type: string
87+
- default: docker
88+
description: The format for the resulting image's mediaType. Valid values are
89+
oci or docker.
90+
name: buildah-format
91+
type: string
10192
- default: []
10293
description: Array of --build-arg values ("arg=value" strings) for buildah
10394
name: build-args
@@ -274,6 +265,10 @@ spec:
274265
value: $(params.build-args-file)
275266
- name: PRIVILEGED_NESTED
276267
value: $(params.privileged-nested)
268+
- name: SOURCE_URL
269+
value: $(tasks.clone-repository.results.url)
270+
- name: BUILDAH_FORMAT
271+
value: $(params.buildah-format)
277272
- name: SOURCE_ARTIFACT
278273
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
279274
- name: CACHI2_ARTIFACT
@@ -309,6 +304,8 @@ spec:
309304
- name: IMAGES
310305
value:
311306
- $(tasks.build-images.results.IMAGE_REF[*])
307+
- name: BUILDAH_FORMAT
308+
value: $(params.buildah-format)
312309
runAfter:
313310
- build-images
314311
taskRef:
@@ -377,7 +374,12 @@ spec:
377374
operator: in
378375
values:
379376
- "false"
380-
- name: clair-scan
377+
- matrix:
378+
params:
379+
- name: image-platform
380+
value:
381+
- $(params.build-platforms)
382+
name: clair-scan
381383
params:
382384
- name: image-digest
383385
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -399,7 +401,12 @@ spec:
399401
operator: in
400402
values:
401403
- "false"
402-
- name: ecosystem-cert-preflight-checks
404+
- matrix:
405+
params:
406+
- name: platform
407+
value:
408+
- $(params.build-platforms)
409+
name: ecosystem-cert-preflight-checks
403410
params:
404411
- name: image-url
405412
value: $(tasks.build-image-index.results.IMAGE_URL)

.tekton/kn-eventing-istio-controller-119-pull-request.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ spec:
2121
value: openshift/ci-operator/knative-images/controller/Dockerfile
2222
- name: build-args
2323
value:
24-
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.24
25-
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
26-
- JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
27-
- JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
28-
- NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
29-
- NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
24+
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
25+
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24
26+
- GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
27+
- JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
28+
- JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
29+
- NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
30+
- NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
3031
- VERSION=1.39.0
3132
- name: git-url
3233
value: '{{source_url}}'

.tekton/kn-eventing-istio-controller-119-push.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ spec:
2020
value: openshift/ci-operator/knative-images/controller/Dockerfile
2121
- name: build-args
2222
value:
23-
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.24
24-
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
25-
- JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
26-
- JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
27-
- NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
28-
- NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
23+
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
24+
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24
25+
- GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
26+
- JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
27+
- JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
28+
- NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
29+
- NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
2930
- VERSION=1.39.0
3031
- name: git-url
3132
value: '{{source_url}}'

0 commit comments

Comments
 (0)