Skip to content

Commit fc2ab3f

Browse files
serverless-qeserverless-qeKaustubh-pande
authored
[release-1.37] Update Konflux configurations (#4208)
* [release-1.37] Sync Konflux configurations * add migrate-level=bundle-object-to-csv-metadata * add migrate-level=bundle-object-to-csv-metadata --------- Co-authored-by: serverless-qe <serverless-support@redhat.com> Co-authored-by: Kaustubh Pande <kaustubhpande.kp@gmail.com>
1 parent 628c84f commit fc2ab3f

4 files changed

Lines changed: 21 additions & 11 deletions

File tree

‎.tekton/bundle-build.yaml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ spec:
161161
- name: BUILD_ARGS
162162
value:
163163
- $(params.build-args[*])
164+
- name: BUILD_ARGS_FILE
165+
value: $(params.build-args-file)
164166
- name: PRIVILEGED_NESTED
165167
value: $(params.privileged-nested)
166168
- name: SOURCE_URL
@@ -181,9 +183,6 @@ spec:
181183
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
182184
- name: CACHI2_ARTIFACT
183185
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
184-
- name: BUILD_ARGS_FILES
185-
value:
186-
- $(params.build-args-file)
187186
runAfter:
188187
- prefetch-dependencies
189188
taskRef:
@@ -235,6 +234,8 @@ spec:
235234
value: $(params.sast-target-dirs)
236235
- name: SOURCE_ARTIFACT
237236
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
237+
- name: CACHI2_ARTIFACT
238+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
238239
runAfter:
239240
- build-image-index
240241
taskRef:
@@ -444,6 +445,8 @@ spec:
444445
value: $(params.sast-target-dirs)
445446
- name: SOURCE_ARTIFACT
446447
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
448+
- name: CACHI2_ARTIFACT
449+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
447450
runAfter:
448451
- build-image-index
449452
taskRef:
@@ -470,6 +473,8 @@ spec:
470473
value: $(params.sast-target-dirs)
471474
- name: SOURCE_ARTIFACT
472475
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
476+
- name: CACHI2_ARTIFACT
477+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
473478
runAfter:
474479
- build-image-index
475480
taskRef:

‎.tekton/docker-build.yaml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ spec:
178178
value: $(params.sast-target-dirs)
179179
- name: SOURCE_ARTIFACT
180180
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
181+
- name: CACHI2_ARTIFACT
182+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
181183
runAfter:
182184
- build-image-index
183185
taskRef:
@@ -304,6 +306,8 @@ spec:
304306
- name: BUILD_ARGS
305307
value:
306308
- $(params.build-args[*])
309+
- name: BUILD_ARGS_FILE
310+
value: $(params.build-args-file)
307311
- name: PRIVILEGED_NESTED
308312
value: $(params.privileged-nested)
309313
- name: SOURCE_URL
@@ -326,9 +330,6 @@ spec:
326330
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
327331
- name: IMAGE_APPEND_PLATFORM
328332
value: "true"
329-
- name: BUILD_ARGS_FILES
330-
value:
331-
- $(params.build-args-file)
332333
runAfter:
333334
- prefetch-dependencies
334335
taskRef:
@@ -472,6 +473,8 @@ spec:
472473
value: $(params.sast-target-dirs)
473474
- name: SOURCE_ARTIFACT
474475
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
476+
- name: CACHI2_ARTIFACT
477+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
475478
runAfter:
476479
- build-image-index
477480
taskRef:
@@ -498,6 +501,8 @@ spec:
498501
value: $(params.sast-target-dirs)
499502
- name: SOURCE_ARTIFACT
500503
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
504+
- name: CACHI2_ARTIFACT
505+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
501506
runAfter:
502507
- build-image-index
503508
taskRef:

‎.tekton/fbc-builder.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,8 @@ spec:
234234
- name: DOCKERFILE
235235
value: $(params.dockerfile)
236236
- name: BUILD_ARGS
237-
value: $(params.build-args[*])
237+
value:
238+
- $(params.build-args[*])
238239
runAfter:
239240
- clone-repository
240241
taskRef:
@@ -298,6 +299,8 @@ spec:
298299
- name: BUILD_ARGS
299300
value:
300301
- $(params.build-args[*])
302+
- name: BUILD_ARGS_FILE
303+
value: $(params.build-args-file)
301304
- name: SOURCE_URL
302305
value: $(tasks.clone-repository.results.url)
303306
- name: HTTP_PROXY
@@ -316,9 +319,6 @@ spec:
316319
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
317320
- name: IMAGE_APPEND_PLATFORM
318321
value: "true"
319-
- name: BUILD_ARGS_FILES
320-
value:
321-
- $(params.build-args-file)
322322
runAfter:
323323
- clone-repository
324324
taskRef:

‎.tekton/serverless-index-137-fbc-50-pull-request.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ metadata:
1616
name: serverless-index-137-fbc-50-on-pull-request
1717
namespace: ocp-serverless-tenant
1818
spec:
19-
params:
19+
params:
2020
- name: dockerfile
2121
value: Dockerfile
2222
- name: path-context

0 commit comments

Comments
 (0)