Skip to content

Commit c6f6709

Browse files
m-rafeeqm-rafeeq
committed
tekton changes for 2.17
1 parent 1d0455a commit c6f6709

14 files changed

+70
-2453
lines changed

‎.tekton/kserve-agent-217-pull-request.yaml

+6-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@ metadata:
77
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
88
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
99
pipelinesascode.tekton.dev/max-keep-runs: "3"
10-
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
11-
== "rhoai-2.17"
10+
pipelinesascode.tekton.dev/on-cel-expression: |
11+
event == "pull_request"
12+
&& target_branch == "rhoai-2.17" && !matches(source_branch, "^konflux/references") && !matches(source_branch, "^konflux/component-updates")
13+
&& ( !".tekton/**".pathChanged() || ".tekton/kserve-agent-217-pull-request.yaml".pathChanged() )
14+
&& !"config/overlays/odh/params.env".pathChanged()
1215
creationTimestamp: null
1316
labels:
1417
appstudio.openshift.io/application: kserve-agent
@@ -577,4 +580,4 @@ spec:
577580
- name: git-auth
578581
secret:
579582
secretName: '{{ git_auth_secret }}'
580-
status: {}
583+
status: {}

‎.tekton/kserve-agent-217-push.yaml

+11-59
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ metadata:
66
build.appstudio.redhat.com/commit_sha: '{{revision}}'
77
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
88
pipelinesascode.tekton.dev/max-keep-runs: "3"
9-
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
10-
== "rhoai-2.17"
9+
build.appstudio.openshift.io/build-nudge-files: ".*.env, .*.json"
10+
pipelinesascode.tekton.dev/on-cel-expression: |
11+
event == "push"
12+
&& target_branch == "rhoai-2.17"
13+
&& ( !".tekton/**".pathChanged() || ".tekton/kserve-agent-217-push.yaml".pathChanged() )
14+
&& !"config/overlays/odh/params.env".pathChanged()
1115
creationTimestamp: null
1216
labels:
1317
appstudio.openshift.io/application: kserve-agent
@@ -22,15 +26,10 @@ spec:
2226
- name: revision
2327
value: '{{revision}}'
2428
- name: output-image
25-
value: quay.io/redhat-user-workloads/rhoai-tenant/kserve-agent-217:{{revision}}
29+
value: quay.io/modh/kserve-agent:{{target_branch}}
2630
- name: dockerfile
2731
value: agent.Dockerfile
2832
pipelineSpec:
29-
description: |
30-
This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.
31-
32-
_Uses `buildah` to create a container image leveraging [trusted artifacts](https://konflux-ci.dev/architecture/ADR/0036-trusted-artifacts.html). It also optionally creates a source image and runs some build-time tests. Information is shared between tasks using OCI artifacts instead of PVCs. EC will pass the [`trusted_task.trusted`](https://enterprisecontract.dev/docs/ec-policies/release_policy.html#trusted_task__trusted) policy as long as all data used to build the artifact is generated from trusted tasks.
33-
This pipeline is pushed as a Tekton bundle to [quay.io](https://quay.io/repository/konflux-ci/tekton-catalog/pipeline-docker-build-oci-ta?tab=tags)_
3433
finally:
3534
- name: show-sbom
3635
params:
@@ -454,60 +453,13 @@ spec:
454453
operator: in
455454
values:
456455
- "false"
457-
- name: sast-shell-check
458-
params:
459-
- name: image-digest
460-
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
461-
- name: image-url
462-
value: $(tasks.build-image-index.results.IMAGE_URL)
463-
- name: SOURCE_ARTIFACT
464-
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
465-
- name: CACHI2_ARTIFACT
466-
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
467-
runAfter:
468-
- build-image-index
469-
taskRef:
470-
params:
471-
- name: name
472-
value: sast-shell-check-oci-ta
473-
- name: bundle
474-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:e1049e55bdd8cf16fba605285a58bd6f61f95694e84b3fffe5d9191417263266
475-
- name: kind
476-
value: task
477-
resolver: bundles
478-
when:
479-
- input: $(params.skip-checks)
480-
operator: in
481-
values:
482-
- "false"
483-
- name: sast-unicode-check
484-
params:
485-
- name: image-url
486-
value: $(tasks.build-image-index.results.IMAGE_URL)
487-
- name: SOURCE_ARTIFACT
488-
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
489-
- name: CACHI2_ARTIFACT
490-
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
491-
runAfter:
492-
- build-image-index
493-
taskRef:
494-
params:
495-
- name: name
496-
value: sast-shell-check-oci-ta
497-
- name: bundle
498-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:e1049e55bdd8cf16fba605285a58bd6f61f95694e84b3fffe5d9191417263266
499-
- name: kind
500-
value: task
501-
resolver: bundles
502-
when:
503-
- input: $(params.skip-checks)
504-
operator: in
505-
values:
506-
- "false"
507456
- name: apply-tags
508457
params:
509458
- name: IMAGE
510459
value: $(tasks.build-image-index.results.IMAGE_URL)
460+
- name: ADDITIONAL_TAGS
461+
value:
462+
- '{{target_branch}}-{{revision}}'
511463
runAfter:
512464
- build-image-index
513465
taskRef:
@@ -574,4 +526,4 @@ spec:
574526
- name: git-auth
575527
secret:
576528
secretName: '{{ git_auth_secret }}'
577-
status: {}
529+
status: {}

‎.tekton/kserve-controller-217-pull-request.yaml

+6-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@ metadata:
77
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
88
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
99
pipelinesascode.tekton.dev/max-keep-runs: "3"
10-
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
11-
== "rhoai-2.17"
10+
pipelinesascode.tekton.dev/on-cel-expression: |
11+
event == "pull_request"
12+
&& target_branch == "rhoai-2.17" && !matches(source_branch, "^konflux/references") && !matches(source_branch, "^konflux/component-updates")
13+
&& ( !".tekton/**".pathChanged() || ".tekton/kserve-controller-217-pull-request.yaml".pathChanged() )
14+
&& !"config/overlays/odh/params.env".pathChanged()
1215
creationTimestamp: null
1316
labels:
1417
appstudio.openshift.io/application: kserve-controller
@@ -577,4 +580,4 @@ spec:
577580
- name: git-auth
578581
secret:
579582
secretName: '{{ git_auth_secret }}'
580-
status: {}
583+
status: {}

‎.tekton/kserve-controller-217-push.yaml

+11-9
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ metadata:
66
build.appstudio.redhat.com/commit_sha: '{{revision}}'
77
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
88
pipelinesascode.tekton.dev/max-keep-runs: "3"
9-
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
10-
== "rhoai-2.17"
9+
build.appstudio.openshift.io/build-nudge-files: ".*.env, .*.json"
10+
pipelinesascode.tekton.dev/on-cel-expression: |
11+
event == "push"
12+
&& target_branch == "rhoai-2.17"
13+
&& ( !".tekton/**".pathChanged() || ".tekton/kserve-controller-217-push.yaml".pathChanged() )
14+
&& !"config/overlays/odh/params.env".pathChanged()
1115
creationTimestamp: null
1216
labels:
1317
appstudio.openshift.io/application: kserve-controller
@@ -22,15 +26,10 @@ spec:
2226
- name: revision
2327
value: '{{revision}}'
2428
- name: output-image
25-
value: quay.io/redhat-user-workloads/rhoai-tenant/kserve-controller-217:{{revision}}
29+
value: quay.io/modh/kserve-controller:{{target_branch}}
2630
- name: dockerfile
2731
value: Dockerfile
2832
pipelineSpec:
29-
description: |
30-
This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.
31-
32-
_Uses `buildah` to create a container image leveraging [trusted artifacts](https://konflux-ci.dev/architecture/ADR/0036-trusted-artifacts.html). It also optionally creates a source image and runs some build-time tests. Information is shared between tasks using OCI artifacts instead of PVCs. EC will pass the [`trusted_task.trusted`](https://enterprisecontract.dev/docs/ec-policies/release_policy.html#trusted_task__trusted) policy as long as all data used to build the artifact is generated from trusted tasks.
33-
This pipeline is pushed as a Tekton bundle to [quay.io](https://quay.io/repository/konflux-ci/tekton-catalog/pipeline-docker-build-oci-ta?tab=tags)_
3433
finally:
3534
- name: show-sbom
3635
params:
@@ -508,6 +507,9 @@ spec:
508507
params:
509508
- name: IMAGE
510509
value: $(tasks.build-image-index.results.IMAGE_URL)
510+
- name: ADDITIONAL_TAGS
511+
value:
512+
- '{{target_branch}}-{{revision}}'
511513
runAfter:
512514
- build-image-index
513515
taskRef:
@@ -574,4 +576,4 @@ spec:
574576
- name: git-auth
575577
secret:
576578
secretName: '{{ git_auth_secret }}'
577-
status: {}
579+
status: {}

0 commit comments

Comments
 (0)