Skip to content

Commit 3b94e5b

Browse files
committed
updated for konflux 7.1
1 parent 5150c21 commit 3b94e5b

File tree

1 file changed

+53
-32
lines changed

1 file changed

+53
-32
lines changed

.tekton/grafana-7-1-pull-request.yaml

Lines changed: 53 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ metadata:
88
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
99
pipelinesascode.tekton.dev/cancel-in-progress: "true"
1010
pipelinesascode.tekton.dev/max-keep-runs: "3"
11-
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
12-
== "release-7.1"
13-
creationTimestamp: null
11+
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "release-7.1"
12+
creationTimestamp:
1413
labels:
1514
appstudio.openshift.io/application: ceph-7-1
1615
appstudio.openshift.io/component: grafana-7-1
@@ -24,12 +23,15 @@ spec:
2423
- name: revision
2524
value: '{{revision}}'
2625
- name: output-image
27-
value: quay.io/rhceph-dev/grafana:on-pr-v7.1-{{revision}}
26+
value: quay.io/rhceph-ci/grafana:on-pr-v7.1-{{revision}}
2827
- name: image-expires-after
2928
value: 5d
3029
- name: build-platforms
3130
value:
3231
- linux/x86_64
32+
- linux/arm64
33+
- linux/s390x
34+
- linux/ppc64le
3335
- name: dockerfile
3436
value: Dockerfile
3537
- name: path-context
@@ -50,7 +52,7 @@ spec:
5052
- name: name
5153
value: show-sbom
5254
- name: bundle
53-
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:1b1df4da95966d08ac6a5b8198710e09e68b5c2cdc707c37d9d19769e65884b2
55+
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:beb0616db051952b4b861dd8c3e00fa1c0eccbd926feddf71194d3bb3ace9ce7
5456
- name: kind
5557
value: task
5658
resolver: bundles
@@ -66,13 +68,11 @@ spec:
6668
name: output-image
6769
type: string
6870
- default: .
69-
description: Path to the source code of an application's component from where
70-
to build image.
71+
description: Path to the source code of an application's component from where to build image.
7172
name: path-context
7273
type: string
7374
- default: Dockerfile
74-
description: Path to the Dockerfile inside the context specified by parameter
75-
path-context
75+
description: Path to the Dockerfile inside the context specified by parameter path-context
7676
name: dockerfile
7777
type: string
7878
- default: "false"
@@ -92,8 +92,7 @@ spec:
9292
name: prefetch-input
9393
type: string
9494
- default: ""
95-
description: Image tag expiration time, time values could be something like
96-
1h, 2d, 3w for hours, days, and weeks, respectively.
95+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
9796
name: image-expires-after
9897
type: string
9998
- default: "true"
@@ -113,16 +112,18 @@ spec:
113112
name: build-args-file
114113
type: string
115114
- default: "false"
116-
description: Whether to enable privileged mode, should be used only with remote
117-
VMs
115+
description: Whether to enable privileged mode, should be used only with remote VMs
118116
name: privileged-nested
119117
type: string
120118
- default:
121119
- linux/x86_64
122-
description: List of platforms to build the container images on. The available
123-
set of values is determined by the configuration of the multi-platform-controller.
120+
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.
124121
name: build-platforms
125122
type: array
123+
- name: buildah-format
124+
default: docker
125+
type: string
126+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
126127
results:
127128
- description: ""
128129
name: IMAGE_URL
@@ -150,7 +151,7 @@ spec:
150151
- name: name
151152
value: init
152153
- name: bundle
153-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:66e90d31e1386bf516fb548cd3e3f0082b5d0234b8b90dbf9e0d4684b70dbe1a
154+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:bbf313b09740fb39b3343bc69ee94b2a2c21d16a9304f9b7c111c305558fc346
154155
- name: kind
155156
value: task
156157
resolver: bundles
@@ -283,7 +284,7 @@ spec:
283284
- name: name
284285
value: build-image-index
285286
- name: bundle
286-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:846dc9975914f31380ec2712fdbac9df3b06c00a9cc7df678315a7f97145efc2
287+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:79784d53749584bc5a8de32142ec4e2f01cdbf42c20d94e59280e0b927c8597d
287288
- name: kind
288289
value: task
289290
resolver: bundles
@@ -296,20 +297,20 @@ spec:
296297
params:
297298
- name: BINARY_IMAGE
298299
value: $(tasks.build-image-index.results.IMAGE_URL)
299-
- name: BINARY_IMAGE_DIGEST
300-
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
301300
- name: SOURCE_ARTIFACT
302301
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
303302
- name: CACHI2_ARTIFACT
304303
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
304+
- name: BINARY_IMAGE_DIGEST
305+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
305306
runAfter:
306307
- build-image-index
307308
taskRef:
308309
params:
309310
- name: name
310311
value: source-build-oci-ta
311312
- name: bundle
312-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:b1eb49583b41872b27356fee20d5f0eb6ff7f5cdeacde7ffb39655f031104728
313+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:2a290f91fdccf4c9ef726a1605163bc14904e1dbf9837ac6d2621caddd10f98e
313314
- name: kind
314315
value: task
315316
resolver: bundles
@@ -335,7 +336,7 @@ spec:
335336
- name: name
336337
value: deprecated-image-check
337338
- name: bundle
338-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:3c8b81fa868e27c6266e7660a4bfb4c822846dcf4304606e71e20893b0d3e515
339+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:f59175d9a0a60411738228dfe568af4684af4aa5e7e05c832927cb917801d489
339340
- name: kind
340341
value: task
341342
resolver: bundles
@@ -344,7 +345,12 @@ spec:
344345
operator: in
345346
values:
346347
- "false"
347-
- name: clair-scan
348+
- matrix:
349+
params:
350+
- name: image-platform
351+
value:
352+
- $(params.build-platforms)
353+
name: clair-scan
348354
params:
349355
- name: image-digest
350356
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -357,7 +363,7 @@ spec:
357363
- name: name
358364
value: clair-scan
359365
- name: bundle
360-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:d354939892f3a904223ec080cc3771bd11931085a5d202323ea491ee8e8c5e43
366+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:a7cc183967f89c4ac100d04ab8f81e54733beee60a0528208107c9a22d3c43af
361367
- name: kind
362368
value: task
363369
resolver: bundles
@@ -377,7 +383,7 @@ spec:
377383
- name: name
378384
value: ecosystem-cert-preflight-checks
379385
- name: bundle
380-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:abbe195626eec925288df6425679559025d1be4af5ae70ca6dbbcb49ad3bf08b
386+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:9568c51a5158d534248908b9b561cf67d2826ed4ea164ffd95628bb42380e6ec
381387
- name: kind
382388
value: task
383389
resolver: bundles
@@ -386,6 +392,11 @@ spec:
386392
operator: in
387393
values:
388394
- "false"
395+
matrix:
396+
params:
397+
- name: platform
398+
value:
399+
- $(params.build-platforms)
389400
- name: sast-snyk-check
390401
params:
391402
- name: image-digest
@@ -403,7 +414,7 @@ spec:
403414
- name: name
404415
value: sast-snyk-check-oci-ta
405416
- name: bundle
406-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:e61f541189b30d14292ef8df36ccaf13f7feb2378fed5f74cb6293b3e79eb687
417+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:181d63c126e3119a9d57b8feed4eb66a875b5208c3e90724c22758e65dca8733
407418
- name: kind
408419
value: task
409420
resolver: bundles
@@ -425,7 +436,7 @@ spec:
425436
- name: name
426437
value: clamav-scan
427438
- name: bundle
428-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:9cab95ac9e833d77a63c079893258b73b8d5a298d93aaf9bdd6722471bc2f338
439+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:b0bd59748cda4a7abf311e4f448e6c1d00c6b6d8c0ecc1c2eb33e08dc0e0b802
429440
- name: kind
430441
value: task
431442
resolver: bundles
@@ -434,6 +445,11 @@ spec:
434445
operator: in
435446
values:
436447
- "false"
448+
matrix:
449+
params:
450+
- name: image-arch
451+
value:
452+
- $(params.build-platforms)
437453
- name: sast-coverity-check
438454
params:
439455
- name: image-digest
@@ -470,7 +486,7 @@ spec:
470486
- name: name
471487
value: sast-coverity-check-oci-ta
472488
- name: bundle
473-
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:c926568ce63e4f63e18bb6a4178caca2e8192f6e3b830bbcd354e6485d29458c
489+
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:cdbe1a968676e4f5519b082bf1e27a4cdcf66dd60af66dbc26b3e604f957f7e9
474490
- name: kind
475491
value: task
476492
resolver: bundles
@@ -517,7 +533,7 @@ spec:
517533
- name: name
518534
value: sast-shell-check-oci-ta
519535
- name: bundle
520-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:808bcaf75271db6a999f53fdefb973a385add94a277d37fbd3df68f8ac7dfaa3
536+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:bf7bdde00b7212f730c1356672290af6f38d070da2c8a316987b5c32fd49e0b9
521537
- name: kind
522538
value: task
523539
resolver: bundles
@@ -558,14 +574,19 @@ spec:
558574
value: $(tasks.build-image-index.results.IMAGE_URL)
559575
- name: IMAGE_DIGEST
560576
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
577+
- name: ADDITIONAL_TAGS
578+
value:
579+
- "pull-request-{{pull_request_number}}"
580+
- "from-branch-{{source_branch}}"
581+
- "{{target_branch}}-$(tasks.clone-repository.results.commit-timestamp)"
561582
runAfter:
562583
- build-image-index
563584
taskRef:
564585
params:
565586
- name: name
566587
value: apply-tags
567588
- name: bundle
568-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:517a51e260c0b59654a9d7b842e1ab07d76bce15ca7ce9c8fd2489a19be6463d
589+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:f44be1bf0262471f2f503f5e19da5f0628dcaf968c86272a2ad6b4871e708448
569590
- name: kind
570591
value: task
571592
resolver: bundles
@@ -588,7 +609,7 @@ spec:
588609
- name: name
589610
value: push-dockerfile-oci-ta
590611
- name: bundle
591-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:5d8013b6a27bbc5e4ff261144616268f28417ed0950d583ef36349fcd59d3d3d
612+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:14fba04580b236e4206a904b86ee2fd8eeaa4163f7619a9c2602d361e4f74c51
592613
- name: kind
593614
value: task
594615
resolver: bundles
@@ -605,7 +626,7 @@ spec:
605626
- name: name
606627
value: rpms-signature-scan
607628
- name: bundle
608-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:7d1c087d7d33dd97effb3b4c9f3788e4c3138da2032040d69da6929e9a3aaceb
629+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:1b6c20ab3dbfb0972803d3ebcb2fa72642e59400c77bd66dfd82028bdd09e120
609630
- name: kind
610631
value: task
611632
resolver: bundles
@@ -620,7 +641,7 @@ spec:
620641
- name: netrc
621642
optional: true
622643
taskRunTemplate:
623-
serviceAccountName: build-pipeline-grafana-7-1
644+
serviceAccountName: build-pipeline-grafana-8-1
624645
workspaces:
625646
- name: git-auth
626647
secret:

0 commit comments

Comments
 (0)