Skip to content

Commit ee68fa1

Browse files
author
serverless-qe
committed
[release-1.37] Sync Konflux configurations
1 parent ffeaa1c commit ee68fa1

File tree

2 files changed

+35
-28
lines changed

2 files changed

+35
-28
lines changed

.tekton/bundle-build.yaml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: tekton.dev/v1
22
kind: Pipeline
33
metadata:
4-
creationTimestamp:
4+
creationTimestamp: null
55
labels:
66
pipelines.openshift.io/runtime: generic
77
pipelines.openshift.io/strategy: docker
@@ -41,7 +41,8 @@ spec:
4141
name: build-source-image
4242
type: string
4343
- default: "false"
44-
description: 'Enable in-development package managers. WARNING: the behavior may change at any time without notice. Use at your own risk.'
44+
description: 'Enable in-development package managers. WARNING: the behavior may
45+
change at any time without notice. Use at your own risk.'
4546
name: prefetch-input-dev-package-managers
4647
- default: []
4748
description: Additional image tags
@@ -58,11 +59,13 @@ spec:
5859
name: output-image
5960
type: string
6061
- default: .
61-
description: Path to the source code of an application's component from where to build image.
62+
description: Path to the source code of an application's component from where
63+
to build image.
6264
name: path-context
6365
type: string
6466
- default: Dockerfile
65-
description: Path to the Dockerfile inside the context specified by parameter path-context
67+
description: Path to the Dockerfile inside the context specified by parameter
68+
path-context
6669
name: dockerfile
6770
type: string
6871
- default: "false"
@@ -82,7 +85,8 @@ spec:
8285
name: prefetch-input
8386
type: string
8487
- default: ""
85-
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
88+
description: Image tag expiration time, time values could be something like 1h,
89+
2d, 3w for hours, days, and weeks, respectively.
8690
name: image-expires-after
8791
type: string
8892
- default: []
@@ -94,12 +98,14 @@ spec:
9498
name: build-args-file
9599
type: string
96100
- default: "false"
97-
description: Whether to enable privileged mode, should be used only with remote VMs
101+
description: Whether to enable privileged mode, should be used only with remote
102+
VMs
98103
name: privileged-nested
99104
type: string
100105
- default:
101106
- linux/x86_64
102-
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.
107+
description: List of platforms to build the container images on. The available
108+
set of values is determined by the configuration of the multi-platform-controller.
103109
name: build-platforms
104110
type: array
105111
results:
@@ -390,7 +396,12 @@ spec:
390396
operator: in
391397
values:
392398
- "false"
393-
- name: clamav-scan
399+
- matrix:
400+
params:
401+
- name: image-arch
402+
value:
403+
- $(params.build-platforms)
404+
name: clamav-scan
394405
params:
395406
- name: image-digest
396407
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -412,11 +423,6 @@ spec:
412423
operator: in
413424
values:
414425
- "false"
415-
matrix:
416-
params:
417-
- name: image-arch
418-
value:
419-
- $(params.build-platforms)
420426
- name: sast-shell-check
421427
params:
422428
- name: image-digest

.tekton/docker-build.yaml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: tekton.dev/v1
22
kind: Pipeline
33
metadata:
4-
creationTimestamp:
4+
creationTimestamp: null
55
labels:
66
pipelines.openshift.io/runtime: generic
77
pipelines.openshift.io/strategy: docker
@@ -33,7 +33,8 @@ spec:
3333
- linux/arm64
3434
- linux/ppc64le
3535
- 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.
36+
description: List of platforms to build the container images on. The available
37+
set of values is determined by the configuration of the multi-platform-controller.
3738
name: build-platforms
3839
type: array
3940
- default: --all-projects --org=3e1a4cca-ebfb-495f-b64c-3cc960d566b4 --exclude=test*,vendor,third_party
@@ -45,7 +46,8 @@ spec:
4546
name: build-source-image
4647
type: string
4748
- default: "false"
48-
description: 'Enable in-development package managers. WARNING: the behavior may change at any time without notice. Use at your own risk.'
49+
description: 'Enable in-development package managers. WARNING: the behavior may
50+
change at any time without notice. Use at your own risk.'
4951
name: prefetch-input-dev-package-managers
5052
- default: []
5153
description: Additional image tags
@@ -62,11 +64,13 @@ spec:
6264
name: output-image
6365
type: string
6466
- default: .
65-
description: Path to the source code of an application's component from where to build image.
67+
description: Path to the source code of an application's component from where
68+
to build image.
6669
name: path-context
6770
type: string
6871
- default: Dockerfile
69-
description: Path to the Dockerfile inside the context specified by parameter path-context
72+
description: Path to the Dockerfile inside the context specified by parameter
73+
path-context
7074
name: dockerfile
7175
type: string
7276
- default: "false"
@@ -86,7 +90,8 @@ spec:
8690
name: prefetch-input
8791
type: string
8892
- default: ""
89-
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
93+
description: Image tag expiration time, time values could be something like 1h,
94+
2d, 3w for hours, days, and weeks, respectively.
9095
name: image-expires-after
9196
type: string
9297
- default: "true"
@@ -102,7 +107,8 @@ spec:
102107
name: build-args-file
103108
type: string
104109
- default: "false"
105-
description: Whether to enable privileged mode, should be used only with remote VMs
110+
description: Whether to enable privileged mode, should be used only with remote
111+
VMs
106112
name: privileged-nested
107113
type: string
108114
results:
@@ -413,12 +419,12 @@ spec:
413419
operator: in
414420
values:
415421
- "false"
416-
matrix:
422+
- matrix:
417423
params:
418-
- name: platform
424+
- name: image-arch
419425
value:
420426
- $(params.build-platforms)
421-
- name: clamav-scan
427+
name: clamav-scan
422428
params:
423429
- name: image-digest
424430
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -440,11 +446,6 @@ spec:
440446
operator: in
441447
values:
442448
- "false"
443-
matrix:
444-
params:
445-
- name: image-arch
446-
value:
447-
- $(params.build-platforms)
448449
- name: sast-shell-check
449450
params:
450451
- name: image-digest

0 commit comments

Comments
 (0)