Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(KONFLUX-3663): format PipelineRun files and upload SAST results #615

Open
wants to merge 2 commits into
base: rhoai-2.10
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions .tekton/kserve-agent-210-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ metadata:
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: |
event == "pull_request"
&& target_branch == "rhoai-2.10"
&& ( !".tekton/**".pathChanged() || ".tekton/kserve-agent-210-pull-request.yaml".pathChanged() )
&& !"config/overlays/odh/params.env".pathChanged()
pipelinesascode.tekton.dev/on-cel-expression: "event == \"pull_request\" \n&& target_branch == \"rhoai-2.10\"\n&& ( !\".tekton/**\".pathChanged() || \".tekton/kserve-agent-210-pull-request.yaml\".pathChanged() )\n&& !\"config/overlays/odh/params.env\".pathChanged()\n"
creationTimestamp: null
labels:
appstudio.openshift.io/application: kserve-agent
Expand Down Expand Up @@ -82,13 +78,11 @@ spec:
name: output-image
type: string
- default: .
description: Path to the source code of an application's component from where
to build image.
description: Path to the source code of an application's component from where to build image.
name: path-context
type: string
- default: Dockerfile
description: Path to the Dockerfile inside the context specified by parameter
path-context
description: Path to the Dockerfile inside the context specified by parameter path-context
name: dockerfile
type: string
- default: "false"
Expand All @@ -112,16 +106,14 @@ spec:
name: java
type: string
- default: ""
description: Image tag expiration time, time values could be something like
1h, 2d, 3w for hours, days, and weeks, respectively.
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
name: image-expires-after
- default: "false"
description: Build a source image.
name: build-source-image
type: string
- default: ""
description: Path to a file with build arguments which will be passed to podman
during build
description: Path to a file with build arguments which will be passed to podman during build
name: build-args-file
type: string
results:
Expand Down Expand Up @@ -344,7 +336,7 @@ spec:
- "false"
- name: sast-snyk-check
runAfter:
- clone-repository
- build-container
taskRef:
params:
- name: name
Expand All @@ -362,6 +354,11 @@ spec:
workspaces:
- name: workspace
workspace: workspace
params:
- name: image-digest
value: $(tasks.build-container.results.IMAGE_DIGEST)
- name: image-url
value: $(tasks.build-container.results.IMAGE_URL)
- name: clamav-scan
params:
- name: image-digest
Expand Down
29 changes: 13 additions & 16 deletions .tekton/kserve-agent-210-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "3"
build.appstudio.openshift.io/build-nudge-files: ".*.env, .*.json"
pipelinesascode.tekton.dev/on-cel-expression: |
event == "push"
&& target_branch == "rhoai-2.10"
&& ( !".tekton/**".pathChanged() || ".tekton/kserve-agent-210-push.yaml".pathChanged() )
&& !"config/overlays/odh/params.env".pathChanged()
pipelinesascode.tekton.dev/on-cel-expression: "event == \"push\" \n&& target_branch == \"rhoai-2.10\" \n&& ( !\".tekton/**\".pathChanged() || \".tekton/kserve-agent-210-push.yaml\".pathChanged() ) \n&& !\"config/overlays/odh/params.env\".pathChanged()\n"
creationTimestamp: null
labels:
appstudio.openshift.io/application: kserve-agent
Expand Down Expand Up @@ -80,13 +76,11 @@ spec:
name: output-image
type: string
- default: .
description: Path to the source code of an application's component from where
to build image.
description: Path to the source code of an application's component from where to build image.
name: path-context
type: string
- default: Dockerfile
description: Path to the Dockerfile inside the context specified by parameter
path-context
description: Path to the Dockerfile inside the context specified by parameter path-context
name: dockerfile
type: string
- default: "false"
Expand All @@ -110,16 +104,14 @@ spec:
name: java
type: string
- default: ""
description: Image tag expiration time, time values could be something like
1h, 2d, 3w for hours, days, and weeks, respectively.
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
name: image-expires-after
- default: "false"
description: Build a source image.
name: build-source-image
type: string
- default: ""
description: Path to a file with build arguments which will be passed to podman
during build
description: Path to a file with build arguments which will be passed to podman during build
name: build-args-file
type: string
results:
Expand Down Expand Up @@ -342,7 +334,7 @@ spec:
- "false"
- name: sast-snyk-check
runAfter:
- clone-repository
- build-container
taskRef:
params:
- name: name
Expand All @@ -360,6 +352,11 @@ spec:
workspaces:
- name: workspace
workspace: workspace
params:
- name: image-digest
value: $(tasks.build-container.results.IMAGE_DIGEST)
- name: image-url
value: $(tasks.build-container.results.IMAGE_URL)
- name: clamav-scan
params:
- name: image-digest
Expand Down Expand Up @@ -409,8 +406,8 @@ spec:
- name: IMAGE
value: $(tasks.build-container.results.IMAGE_URL)
- name: ADDITIONAL_TAGS
value:
- '{{target_branch}}-{{revision}}'
value:
- '{{target_branch}}-{{revision}}'
runAfter:
- build-container
taskRef:
Expand Down
25 changes: 11 additions & 14 deletions .tekton/kserve-controller-210-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ metadata:
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: |
event == "pull_request"
&& target_branch == "rhoai-2.10"
&& ( !".tekton/**".pathChanged() || ".tekton/kserve-controller-210-pull-request.yaml".pathChanged() )
&& !"config/overlays/odh/params.env".pathChanged()
pipelinesascode.tekton.dev/on-cel-expression: "event == \"pull_request\" \n&& target_branch == \"rhoai-2.10\" \n&& ( !\".tekton/**\".pathChanged() || \".tekton/kserve-controller-210-pull-request.yaml\".pathChanged() ) \n&& !\"config/overlays/odh/params.env\".pathChanged()\n"
creationTimestamp: null
labels:
appstudio.openshift.io/application: kserve-controller
Expand Down Expand Up @@ -82,13 +78,11 @@ spec:
name: output-image
type: string
- default: .
description: Path to the source code of an application's component from where
to build image.
description: Path to the source code of an application's component from where to build image.
name: path-context
type: string
- default: Dockerfile
description: Path to the Dockerfile inside the context specified by parameter
path-context
description: Path to the Dockerfile inside the context specified by parameter path-context
name: dockerfile
type: string
- default: "false"
Expand All @@ -112,16 +106,14 @@ spec:
name: java
type: string
- default: ""
description: Image tag expiration time, time values could be something like
1h, 2d, 3w for hours, days, and weeks, respectively.
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
name: image-expires-after
- default: "false"
description: Build a source image.
name: build-source-image
type: string
- default: ""
description: Path to a file with build arguments which will be passed to podman
during build
description: Path to a file with build arguments which will be passed to podman during build
name: build-args-file
type: string
results:
Expand Down Expand Up @@ -344,7 +336,7 @@ spec:
- "false"
- name: sast-snyk-check
runAfter:
- clone-repository
- build-container
taskRef:
params:
- name: name
Expand All @@ -362,6 +354,11 @@ spec:
workspaces:
- name: workspace
workspace: workspace
params:
- name: image-digest
value: $(tasks.build-container.results.IMAGE_DIGEST)
- name: image-url
value: $(tasks.build-container.results.IMAGE_URL)
- name: clamav-scan
params:
- name: image-digest
Expand Down
29 changes: 13 additions & 16 deletions .tekton/kserve-controller-210-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "3"
build.appstudio.openshift.io/build-nudge-files: ".*.env, .*.json"
pipelinesascode.tekton.dev/on-cel-expression: |
event == "push"
&& target_branch == "rhoai-2.10"
&& ( !".tekton/**".pathChanged() || ".tekton/kserve-controller-210-push.yaml".pathChanged() )
&& !"config/overlays/odh/params.env".pathChanged()
pipelinesascode.tekton.dev/on-cel-expression: "event == \"push\" \n&& target_branch == \"rhoai-2.10\" \n&& ( !\".tekton/**\".pathChanged() || \".tekton/kserve-controller-210-push.yaml\".pathChanged() ) \n&& !\"config/overlays/odh/params.env\".pathChanged()\n"
creationTimestamp: null
labels:
appstudio.openshift.io/application: kserve-controller
Expand Down Expand Up @@ -80,13 +76,11 @@ spec:
name: output-image
type: string
- default: .
description: Path to the source code of an application's component from where
to build image.
description: Path to the source code of an application's component from where to build image.
name: path-context
type: string
- default: Dockerfile
description: Path to the Dockerfile inside the context specified by parameter
path-context
description: Path to the Dockerfile inside the context specified by parameter path-context
name: dockerfile
type: string
- default: "false"
Expand All @@ -110,16 +104,14 @@ spec:
name: java
type: string
- default: ""
description: Image tag expiration time, time values could be something like
1h, 2d, 3w for hours, days, and weeks, respectively.
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
name: image-expires-after
- default: "false"
description: Build a source image.
name: build-source-image
type: string
- default: ""
description: Path to a file with build arguments which will be passed to podman
during build
description: Path to a file with build arguments which will be passed to podman during build
name: build-args-file
type: string
results:
Expand Down Expand Up @@ -342,7 +334,7 @@ spec:
- "false"
- name: sast-snyk-check
runAfter:
- clone-repository
- build-container
taskRef:
params:
- name: name
Expand All @@ -360,6 +352,11 @@ spec:
workspaces:
- name: workspace
workspace: workspace
params:
- name: image-digest
value: $(tasks.build-container.results.IMAGE_DIGEST)
- name: image-url
value: $(tasks.build-container.results.IMAGE_URL)
- name: clamav-scan
params:
- name: image-digest
Expand Down Expand Up @@ -409,8 +406,8 @@ spec:
- name: IMAGE
value: $(tasks.build-container.results.IMAGE_URL)
- name: ADDITIONAL_TAGS
value:
- '{{target_branch}}-{{revision}}'
value:
- '{{target_branch}}-{{revision}}'
runAfter:
- build-container
taskRef:
Expand Down
25 changes: 11 additions & 14 deletions .tekton/kserve-router-210-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ metadata:
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: |
event == "pull_request"
&& target_branch == "rhoai-2.10"
&& ( !".tekton/**".pathChanged() || ".tekton/kserve-router-210-pull-request.yaml".pathChanged() )
&& !"config/overlays/odh/params.env".pathChanged()
pipelinesascode.tekton.dev/on-cel-expression: "event == \"pull_request\" \n&& target_branch == \"rhoai-2.10\" \n&& ( !\".tekton/**\".pathChanged() || \".tekton/kserve-router-210-pull-request.yaml\".pathChanged() ) \n&& !\"config/overlays/odh/params.env\".pathChanged()\n"
creationTimestamp: null
labels:
appstudio.openshift.io/application: kserve-router
Expand Down Expand Up @@ -82,13 +78,11 @@ spec:
name: output-image
type: string
- default: .
description: Path to the source code of an application's component from where
to build image.
description: Path to the source code of an application's component from where to build image.
name: path-context
type: string
- default: Dockerfile
description: Path to the Dockerfile inside the context specified by parameter
path-context
description: Path to the Dockerfile inside the context specified by parameter path-context
name: dockerfile
type: string
- default: "false"
Expand All @@ -112,16 +106,14 @@ spec:
name: java
type: string
- default: ""
description: Image tag expiration time, time values could be something like
1h, 2d, 3w for hours, days, and weeks, respectively.
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
name: image-expires-after
- default: "false"
description: Build a source image.
name: build-source-image
type: string
- default: ""
description: Path to a file with build arguments which will be passed to podman
during build
description: Path to a file with build arguments which will be passed to podman during build
name: build-args-file
type: string
results:
Expand Down Expand Up @@ -344,7 +336,7 @@ spec:
- "false"
- name: sast-snyk-check
runAfter:
- clone-repository
- build-container
taskRef:
params:
- name: name
Expand All @@ -362,6 +354,11 @@ spec:
workspaces:
- name: workspace
workspace: workspace
params:
- name: image-digest
value: $(tasks.build-container.results.IMAGE_DIGEST)
- name: image-url
value: $(tasks.build-container.results.IMAGE_URL)
- name: clamav-scan
params:
- name: image-digest
Expand Down
Loading