Skip to content

Commit e0152fe

Browse files
committed
Switch to using OCI Trusted Artifacts Pipeline
Ref: EC-556 Signed-off-by: Luiz Carvalho <lucarval@redhat.com>
1 parent b6233aa commit e0152fe

File tree

2 files changed

+64
-116
lines changed

2 files changed

+64
-116
lines changed

.tekton/cli-main-ci-pull-request.yaml

Lines changed: 31 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -51,28 +51,6 @@ spec:
5151
- name: kind
5252
value: task
5353
resolver: bundles
54-
- name: show-summary
55-
params:
56-
- name: pipelinerun-name
57-
value: $(context.pipelineRun.name)
58-
- name: git-url
59-
value: $(tasks.clone-repository.results.url)?rev=$(tasks.clone-repository.results.commit)
60-
- name: image-url
61-
value: $(params.output-image)
62-
- name: build-task-status
63-
value: $(tasks.build-container.status)
64-
taskRef:
65-
params:
66-
- name: name
67-
value: summary
68-
- name: bundle
69-
value: quay.io/redhat-appstudio-tekton-catalog/task-summary:0.2@sha256:c718319bd57c4f0ab1843cf98d813d0a26a73e0c8ce66218079c3c865508b0fb
70-
- name: kind
71-
value: task
72-
resolver: bundles
73-
workspaces:
74-
- name: workspace
75-
workspace: workspace
7654
params:
7755
- description: Source Repository URL
7856
name: git-url
@@ -162,6 +140,10 @@ spec:
162140
value: $(params.git-url)
163141
- name: revision
164142
value: $(params.revision)
143+
- name: ociStorage
144+
value: $(params.output-image).git
145+
- name: ociArtifactExpiresAfter
146+
value: $(params.image-expires-after)
165147
- name: depth
166148
value: "0"
167149
- name: fetchTags
@@ -171,9 +153,9 @@ spec:
171153
taskRef:
172154
params:
173155
- name: name
174-
value: git-clone
156+
value: git-clone-oci-ta
175157
- name: bundle
176-
value: quay.io/redhat-appstudio-tekton-catalog/task-git-clone:0.1@sha256:729ed7f3b7a3da2658c80655039989a66da207b91036893409bd1305e69a655f
158+
value: quay.io/redhat-appstudio-tekton-catalog/task-git-clone-oci-ta:0.1@sha256:c18dc89b0c35f425a5dd10aa48a7e5177deb6addcc06db99646df17fcdde5a2d
177159
- name: kind
178160
value: task
179161
resolver: bundles
@@ -183,28 +165,29 @@ spec:
183165
values:
184166
- "true"
185167
workspaces:
186-
- name: output
187-
workspace: workspace
188168
- name: basic-auth
189169
workspace: git-auth
190170
- name: prefetch-dependencies
191171
params:
192172
- name: input
193173
value: $(params.prefetch-input)
174+
- name: SOURCE_ARTIFACT
175+
value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
176+
- name: ociStorage
177+
value: $(params.output-image).prefetch
178+
- name: ociArtifactExpiresAfter
179+
value: $(params.image-expires-after)
194180
runAfter:
195181
- clone-repository
196182
taskRef:
197183
params:
198184
- name: name
199-
value: prefetch-dependencies
185+
value: prefetch-dependencies-oci-ta
200186
- name: bundle
201-
value: quay.io/redhat-appstudio-tekton-catalog/task-prefetch-dependencies:0.1@sha256:0285e38b5b88552ef3d760db83e6a0ce91d8d308b48890885f51b13571a4e057
187+
value: quay.io/redhat-appstudio-tekton-catalog/task-prefetch-dependencies-oci-ta:0.1@sha256:fe351ee58ed07d7455b32a01dddecf7512dc56506b6260c17fa9a1b4513d02dc
202188
- name: kind
203189
value: task
204190
resolver: bundles
205-
workspaces:
206-
- name: source
207-
workspace: workspace
208191
- name: build-container
209192
params:
210193
- name: IMAGE
@@ -223,14 +206,18 @@ spec:
223206
value: $(tasks.clone-repository.results.commit)
224207
- name: BUILD_ARGS_FILE
225208
value: "$(params.build-args-file)"
209+
- name: SOURCE_ARTIFACT
210+
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
211+
- name: CACHI2_ARTIFACT
212+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
226213
runAfter:
227214
- prefetch-dependencies
228215
taskRef:
229216
params:
230217
- name: name
231-
value: buildah
218+
value: buildah-oci-ta
232219
- name: bundle
233-
value: quay.io/redhat-appstudio-tekton-catalog/task-buildah:0.1@sha256:13447a7b6a20e51875124c3510a4b6e86119f7b3ba89e2c997e0befefefb65f4
220+
value: quay.io/redhat-appstudio-tekton-catalog/task-buildah-oci-ta:0.1@sha256:4fe8b5f597759bce6c71979dec50e07e5831c493f10d7c9035c61a2b87cfa9eb
234221
- name: kind
235222
value: task
236223
resolver: bundles
@@ -239,23 +226,24 @@ spec:
239226
operator: in
240227
values:
241228
- "true"
242-
workspaces:
243-
- name: source
244-
workspace: workspace
245229
- name: build-source-image
246230
params:
247231
- name: BINARY_IMAGE
248232
value: $(params.output-image)
249233
- name: BASE_IMAGES
250234
value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
235+
- name: SOURCE_ARTIFACT
236+
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
237+
- name: CACHI2_ARTIFACT
238+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
251239
runAfter:
252240
- build-container
253241
taskRef:
254242
params:
255243
- name: name
256-
value: source-build
244+
value: source-build-oci-ta
257245
- name: bundle
258-
value: quay.io/redhat-appstudio-tekton-catalog/task-source-build:0.1@sha256:1a976a35adee9163e455d0c5aee5d9bf9cb3c6a770656ae347558f8c54977709
246+
value: quay.io/redhat-appstudio-tekton-catalog/task-source-build-oci-ta:0.1@sha256:ae12b84e22d77cc1112c03b2182dcc14bb7da6a9fdbebab00be57c725d0ef4cf
259247
- name: kind
260248
value: task
261249
resolver: bundles
@@ -268,9 +256,6 @@ spec:
268256
operator: in
269257
values:
270258
- "true"
271-
workspaces:
272-
- name: workspace
273-
workspace: workspace
274259
- name: deprecated-base-image-check
275260
params:
276261
- name: BASE_IMAGES_DIGESTS
@@ -338,14 +323,17 @@ spec:
338323
values:
339324
- "false"
340325
- name: sast-snyk-check
326+
params:
327+
- name: SOURCE_ARTIFACT
328+
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
341329
runAfter:
342330
- clone-repository
343331
taskRef:
344332
params:
345333
- name: name
346-
value: sast-snyk-check
334+
value: sast-snyk-check-oci-ta
347335
- name: bundle
348-
value: quay.io/redhat-appstudio-tekton-catalog/task-sast-snyk-check:0.1@sha256:242acc527a06a11fac9dd6524467f62f3a086c186c5f885973e5780a04d4289c
336+
value: quay.io/redhat-appstudio-tekton-catalog/task-sast-snyk-check-oci-ta:0.1@sha256:9ec1e2dea3dad0af7f84858eb5b177f1a7244a2bf71e625a429d44ff5a9359ce
349337
- name: kind
350338
value: task
351339
resolver: bundles
@@ -354,9 +342,6 @@ spec:
354342
operator: in
355343
values:
356344
- "false"
357-
workspaces:
358-
- name: workspace
359-
workspace: workspace
360345
- name: clamav-scan
361346
params:
362347
- name: image-digest
@@ -402,22 +387,10 @@ spec:
402387
values:
403388
- "false"
404389
workspaces:
405-
- name: workspace
406390
- name: git-auth
407391
optional: true
408392
taskRunTemplate: {}
409393
workspaces:
410-
- name: workspace
411-
volumeClaimTemplate:
412-
metadata:
413-
creationTimestamp: null
414-
spec:
415-
accessModes:
416-
- ReadWriteOnce
417-
resources:
418-
requests:
419-
storage: 1Gi
420-
status: {}
421394
- name: git-auth
422395
secret:
423396
secretName: '{{ git_auth_secret }}'

0 commit comments

Comments
 (0)