From e198e35f6ec4e4c60ef39f8a68839722cd506d0f Mon Sep 17 00:00:00 2001 From: ccronca Date: Mon, 12 Aug 2024 17:53:08 +0200 Subject: [PATCH 1/2] fix(KONFLUX-3663): format Tekton PipelineRun files Format PipelineRun files with yq for consistent indentation and format Signed-off-by: ccronca --- .tekton/hive-mce-25-pull-request.yaml | 12 ++++-------- .tekton/hive-mce-25-push.yaml | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.tekton/hive-mce-25-pull-request.yaml b/.tekton/hive-mce-25-pull-request.yaml index 5cdf48d647f..3ddf9f856de 100644 --- a/.tekton/hive-mce-25-pull-request.yaml +++ b/.tekton/hive-mce-25-pull-request.yaml @@ -7,8 +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 - == "mce-2.5" + pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "mce-2.5" creationTimestamp: null labels: appstudio.openshift.io/application: release-mce-25 @@ -79,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" @@ -109,8 +106,7 @@ 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. diff --git a/.tekton/hive-mce-25-push.yaml b/.tekton/hive-mce-25-push.yaml index e85d551d893..bbcbd386db4 100644 --- a/.tekton/hive-mce-25-push.yaml +++ b/.tekton/hive-mce-25-push.yaml @@ -6,8 +6,7 @@ metadata: build.appstudio.redhat.com/commit_sha: '{{revision}}' build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch - == "mce-2.5" + pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "mce-2.5" creationTimestamp: null labels: appstudio.openshift.io/application: release-mce-25 @@ -76,13 +75,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" @@ -106,8 +103,7 @@ 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. From 31ab29f077316910ac306ddae34ab576b3659e94 Mon Sep 17 00:00:00 2001 From: ccronca Date: Mon, 12 Aug 2024 17:53:08 +0200 Subject: [PATCH 2/2] fix(KONFLUX-3663): upload SAST results to quay.io Configure the SAST task to upload SARIF results to quay.io for long-term storage Signed-off-by: ccronca --- .tekton/hive-mce-25-pull-request.yaml | 7 ++++++- .tekton/hive-mce-25-push.yaml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.tekton/hive-mce-25-pull-request.yaml b/.tekton/hive-mce-25-pull-request.yaml index 3ddf9f856de..25c90ee389e 100644 --- a/.tekton/hive-mce-25-pull-request.yaml +++ b/.tekton/hive-mce-25-pull-request.yaml @@ -324,7 +324,7 @@ spec: - "false" - name: sast-snyk-check runAfter: - - clone-repository + - build-container taskRef: params: - name: name @@ -342,6 +342,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 diff --git a/.tekton/hive-mce-25-push.yaml b/.tekton/hive-mce-25-push.yaml index bbcbd386db4..d748673092b 100644 --- a/.tekton/hive-mce-25-push.yaml +++ b/.tekton/hive-mce-25-push.yaml @@ -321,7 +321,7 @@ spec: - "false" - name: sast-snyk-check runAfter: - - clone-repository + - build-container taskRef: params: - name: name @@ -339,6 +339,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