Skip to content

Commit 3e07bb7

Browse files
Enable konflux multi arch build (#830)
1 parent 766dee5 commit 3e07bb7

14 files changed

+1410
-2197
lines changed

.tekton/network-observability-operator-bundle-pull-request.yaml

Lines changed: 6 additions & 449 deletions
Large diffs are not rendered by default.

.tekton/network-observability-operator-bundle-push.yaml

Lines changed: 6 additions & 449 deletions
Large diffs are not rendered by default.

.tekton/network-observability-operator-fbc-pull-request.yaml

Lines changed: 4 additions & 359 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
pipelinesascode.tekton.dev/max-keep-runs: "3"
1010
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" &&
1111
(".tekton/***".pathChanged() ||
12-
"catalog.Dockerfile".pathChanged() ||
12+
"catalog.Dockerfile.downstream".pathChanged() ||
1313
"catalog/***".pathChanged() ||
1414
"hack/update-build.sh".pathChanged() ||
1515
"hack/bundle_digest.sh".pathChanged() ||
@@ -33,364 +33,9 @@ spec:
3333
- name: image-expires-after
3434
value: 5d
3535
- name: dockerfile
36-
value: ./catalog.Dockerfile
37-
pipelineSpec:
38-
finally:
39-
- name: show-sbom
40-
params:
41-
- name: IMAGE_URL
42-
value: $(tasks.build-container.results.IMAGE_URL)
43-
taskRef:
44-
params:
45-
- name: name
46-
value: show-sbom
47-
- name: bundle
48-
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:9bfc6b99ef038800fe131d7b45ff3cd4da3a415dd536f7c657b3527b01c4a13b
49-
- name: kind
50-
value: task
51-
resolver: bundles
52-
- name: show-summary
53-
params:
54-
- name: pipelinerun-name
55-
value: $(context.pipelineRun.name)
56-
- name: git-url
57-
value: $(tasks.clone-repository.results.url)?rev=$(tasks.clone-repository.results.commit)
58-
- name: image-url
59-
value: $(params.output-image)
60-
- name: build-task-status
61-
value: $(tasks.build-container.status)
62-
taskRef:
63-
params:
64-
- name: name
65-
value: summary
66-
- name: bundle
67-
value: quay.io/konflux-ci/tekton-catalog/task-summary:0.2@sha256:d97c04ab42f277b1103eb6f3a053b247849f4f5b3237ea302a8ecada3b24e15b
68-
- name: kind
69-
value: task
70-
resolver: bundles
71-
workspaces:
72-
- name: workspace
73-
workspace: workspace
74-
params:
75-
- description: Source Repository URL
76-
name: git-url
77-
type: string
78-
- default: ""
79-
description: Revision of the Source Repository
80-
name: revision
81-
type: string
82-
- description: Fully Qualified Output Image
83-
name: output-image
84-
type: string
85-
- default: .
86-
description: Path to the source code of an application's component from where
87-
to build image.
88-
name: path-context
89-
type: string
90-
- default: Dockerfile
91-
description: Path to the Dockerfile inside the context specified by parameter
92-
path-context
93-
name: dockerfile
94-
type: string
95-
- default: "false"
96-
description: Force rebuild image
97-
name: rebuild
98-
type: string
99-
- default: "false"
100-
description: Skip checks against built image
101-
name: skip-checks
102-
type: string
103-
- default: "true"
104-
description: Execute the build with network isolation
105-
name: hermetic
106-
type: string
107-
- default: "{\"type\":\"gomod\", \"path\":\".\"}"
108-
description: Build dependencies to be prefetched by Cachi2
109-
name: prefetch-input
110-
type: string
111-
- default: "false"
112-
description: Java build
113-
name: java
114-
type: string
115-
- default: ""
116-
description: Image tag expiration time, time values could be something like
117-
1h, 2d, 3w for hours, days, and weeks, respectively.
118-
name: image-expires-after
119-
- default: "true"
120-
description: Build a source image.
121-
name: build-source-image
122-
type: string
123-
results:
124-
- description: ""
125-
name: IMAGE_URL
126-
value: $(tasks.build-container.results.IMAGE_URL)
127-
- description: ""
128-
name: IMAGE_DIGEST
129-
value: $(tasks.build-container.results.IMAGE_DIGEST)
130-
- description: ""
131-
name: CHAINS-GIT_URL
132-
value: $(tasks.clone-repository.results.url)
133-
- description: ""
134-
name: CHAINS-GIT_COMMIT
135-
value: $(tasks.clone-repository.results.commit)
136-
tasks:
137-
- name: init
138-
params:
139-
- name: image-url
140-
value: $(params.output-image)
141-
- name: rebuild
142-
value: $(params.rebuild)
143-
- name: skip-checks
144-
value: $(params.skip-checks)
145-
taskRef:
146-
params:
147-
- name: name
148-
value: init
149-
- name: bundle
150-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:092c113b614f6551113f17605ae9cb7e822aa704d07f0e37ed209da23ce392cc
151-
- name: kind
152-
value: task
153-
resolver: bundles
154-
- name: clone-repository
155-
params:
156-
- name: url
157-
value: $(params.git-url)
158-
- name: revision
159-
value: $(params.revision)
160-
runAfter:
161-
- init
162-
taskRef:
163-
params:
164-
- name: name
165-
value: git-clone
166-
- name: bundle
167-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:0bb1be8363557e8e07ec34a3c5daaaaa23c9d533f0bb12f00dc604d00de50814
168-
- name: kind
169-
value: task
170-
resolver: bundles
171-
when:
172-
- input: $(tasks.init.results.build)
173-
operator: in
174-
values:
175-
- "true"
176-
workspaces:
177-
- name: output
178-
workspace: workspace
179-
- name: basic-auth
180-
workspace: git-auth
181-
- name: update-downstream
182-
taskSpec:
183-
steps:
184-
- image: registry.access.redhat.com/ubi9/ubi:9.4
185-
script: |
186-
#!/usr/bin/env bash
187-
echo "Starting update-downstream task"
188-
cd workspace/source/source
189-
dnf install -y python3-ruamel-yaml-clib
190-
COMMIT={{revision}} ./hack/update-build.sh
191-
runAfter:
192-
- clone-repository
193-
workspaces:
194-
- name: source
195-
workspace: workspace
196-
- name: git-basic-auth
197-
workspace: git-auth
198-
- name: build-container
199-
params:
200-
- name: IMAGE
201-
value: $(params.output-image)
202-
- name: DOCKERFILE
203-
value: $(params.dockerfile)
204-
- name: CONTEXT
205-
value: $(params.path-context)
206-
- name: HERMETIC
207-
value: "true"
208-
- name: IMAGE_EXPIRES_AFTER
209-
value: $(params.image-expires-after)
210-
- name: COMMIT_SHA
211-
value: $(tasks.clone-repository.results.commit)
212-
runAfter:
213-
- clone-repository
214-
- update-downstream
215-
taskRef:
216-
params:
217-
- name: name
218-
value: buildah
219-
- name: bundle
220-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:71d3bb81d1c7c9f99946b5f1d4844664f2036636fd114cf5232db644bc088981
221-
- name: kind
222-
value: task
223-
resolver: bundles
224-
when:
225-
- input: $(tasks.init.results.build)
226-
operator: in
227-
values:
228-
- "true"
229-
workspaces:
230-
- name: source
231-
workspace: workspace
232-
- name: deprecated-base-image-check
233-
params:
234-
- name: IMAGE_URL
235-
value: $(tasks.build-container.results.IMAGE_URL)
236-
- name: IMAGE_DIGEST
237-
value: $(tasks.build-container.results.IMAGE_DIGEST)
238-
runAfter:
239-
- build-container
240-
taskRef:
241-
params:
242-
- name: name
243-
value: deprecated-image-check
244-
- name: bundle
245-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.4@sha256:b4f9599f5770ea2e6e4d031224ccc932164c1ecde7f85f68e16e99c98d754003
246-
- name: kind
247-
value: task
248-
resolver: bundles
249-
when:
250-
- input: $(params.skip-checks)
251-
operator: in
252-
values:
253-
- "false"
254-
- name: sbom-json-check
255-
params:
256-
- name: IMAGE_URL
257-
value: $(tasks.build-container.results.IMAGE_URL)
258-
- name: IMAGE_DIGEST
259-
value: $(tasks.build-container.results.IMAGE_DIGEST)
260-
runAfter:
261-
- build-container
262-
taskRef:
263-
params:
264-
- name: name
265-
value: sbom-json-check
266-
- name: bundle
267-
value: quay.io/konflux-ci/tekton-catalog/task-sbom-json-check:0.2@sha256:468b5615993bb6d75df3d66180df5eb8728bbef59efe509eb5ac89b7ac582f16
268-
- name: kind
269-
value: task
270-
resolver: bundles
271-
when:
272-
- input: $(params.skip-checks)
273-
operator: in
274-
values:
275-
- "false"
276-
- name: apply-tags
277-
params:
278-
- name: IMAGE
279-
value: $(tasks.build-container.results.IMAGE_URL)
280-
runAfter:
281-
- build-container
282-
taskRef:
283-
params:
284-
- name: name
285-
value: apply-tags
286-
- name: bundle
287-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:e6beb161ed59d7be26317da03e172137b31b26648d3e139558e9a457bc56caff
288-
- name: kind
289-
value: task
290-
resolver: bundles
291-
- name: push-dockerfile
292-
params:
293-
- name: IMAGE
294-
value: $(tasks.build-container.results.IMAGE_URL)
295-
- name: IMAGE_DIGEST
296-
value: $(tasks.build-container.results.IMAGE_DIGEST)
297-
- name: DOCKERFILE
298-
value: $(params.dockerfile)
299-
- name: CONTEXT
300-
value: $(params.path-context)
301-
runAfter:
302-
- build-container
303-
taskRef:
304-
params:
305-
- name: name
306-
value: push-dockerfile
307-
- name: bundle
308-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile:0.1@sha256:0d2b6d31dc8bc02c5493d7d28a163bb6c867be5f86c3a82388b0d5c69e18d352
309-
- name: kind
310-
value: task
311-
resolver: bundles
312-
workspaces:
313-
- name: workspace
314-
workspace: workspace
315-
- name: inspect-image
316-
params:
317-
- name: IMAGE_URL
318-
value: $(tasks.build-container.results.IMAGE_URL)
319-
- name: IMAGE_DIGEST
320-
value: $(tasks.build-container.results.IMAGE_DIGEST)
321-
runAfter:
322-
- build-container
323-
taskRef:
324-
params:
325-
- name: name
326-
value: inspect-image
327-
- name: bundle
328-
value: quay.io/konflux-ci/tekton-catalog/task-inspect-image:0.1@sha256:09c6248583be3fa31d047fb5ebf84c5253cfdd0556adc7d42fc901161152ea87
329-
- name: kind
330-
value: task
331-
resolver: bundles
332-
when:
333-
- input: $(params.skip-checks)
334-
operator: in
335-
values:
336-
- "false"
337-
workspaces:
338-
- name: source
339-
workspace: workspace
340-
- name: fbc-validate
341-
params:
342-
- name: IMAGE_URL
343-
value: $(tasks.build-container.results.IMAGE_URL)
344-
- name: IMAGE_DIGEST
345-
value: $(tasks.build-container.results.IMAGE_DIGEST)
346-
- name: BASE_IMAGE
347-
value: $(tasks.inspect-image.results.BASE_IMAGE)
348-
runAfter:
349-
- inspect-image
350-
taskRef:
351-
params:
352-
- name: name
353-
value: fbc-validation
354-
- name: bundle
355-
value: quay.io/konflux-ci/tekton-catalog/task-fbc-validation:0.1@sha256:9d263aedb24b0d2bf4b9fc6d37e5a8bc8593a26bf6485e0843bd19da5da24ce8
356-
- name: kind
357-
value: task
358-
resolver: bundles
359-
when:
360-
- input: $(params.skip-checks)
361-
operator: in
362-
values:
363-
- "false"
364-
workspaces:
365-
- name: workspace
366-
workspace: workspace
367-
- name: fbc-related-image-check
368-
runAfter:
369-
- fbc-validate
370-
taskRef:
371-
params:
372-
- name: name
373-
value: fbc-related-image-check
374-
- name: bundle
375-
value: quay.io/konflux-ci/tekton-catalog/task-fbc-related-image-check:0.1@sha256:23da3e821658f91dd0c94d1c1f9028f12c0e11da12fa24cbafc127d7c76e3d5f
376-
- name: kind
377-
value: task
378-
resolver: bundles
379-
when:
380-
- input: $(params.skip-checks)
381-
operator: in
382-
values:
383-
- "false"
384-
workspaces:
385-
- name: workspace
386-
workspace: workspace
387-
workspaces:
388-
- name: workspace
389-
- name: git-auth
390-
optional: true
391-
- name: netrc
392-
optional: true
393-
taskRunTemplate: {}
36+
value: ./catalog.Dockerfile.downstream
37+
pipelineRef:
38+
name: build-fbc-pipeline
39439
workspaces:
39540
- name: workspace
39641
volumeClaimTemplate:

0 commit comments

Comments
 (0)