From a59ab95e13638a6ab74308a3f3145f15450ffa98 Mon Sep 17 00:00:00 2001 From: Kyle Lape Date: Thu, 25 Jan 2024 12:07:07 -0600 Subject: [PATCH] comment out clamav scan for now there is a problem with the scan where it takes over two hours to complete on an openshift cluster, but runs in ~1m on my local box. --- .tekton/scanner-pull-request.yaml | 52 +++++++++++++++---------------- .tekton/scanner-push.yaml | 44 +++++++++++++------------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/.tekton/scanner-pull-request.yaml b/.tekton/scanner-pull-request.yaml index 82388eb3e..b1829a85c 100644 --- a/.tekton/scanner-pull-request.yaml +++ b/.tekton/scanner-pull-request.yaml @@ -371,32 +371,32 @@ spec: workspaces: - name: workspace workspace: workspace - - name: clamav-scan - computeResources: - requests: - cpu: 1 - params: - - name: image-digest - value: $(tasks.build-container.results.IMAGE_DIGEST) - - name: image-url - value: $(tasks.build-container.results.IMAGE_URL) - runAfter: - - build-container - timeout: 3h - taskRef: - params: - - name: name - value: clamav-scan - - name: bundle - value: quay.io/redhat-appstudio-tekton-catalog/task-clamav-scan:0.1@sha256:353fa2cda9855217cfcec3303973b666a10f384795630cf0eb13b874c24b0f7a - - name: kind - value: task - resolver: bundles - when: - - input: $(params.skip-checks) - operator: in - values: - - "false" + # - name: clamav-scan + # computeResources: + # requests: + # cpu: 1 + # params: + # - name: image-digest + # value: $(tasks.build-container.results.IMAGE_DIGEST) + # - name: image-url + # value: $(tasks.build-container.results.IMAGE_URL) + # runAfter: + # - build-container + # timeout: 3h + # taskRef: + # params: + # - name: name + # value: clamav-scan + # - name: bundle + # value: quay.io/redhat-appstudio-tekton-catalog/task-clamav-scan:0.1@sha256:353fa2cda9855217cfcec3303973b666a10f384795630cf0eb13b874c24b0f7a + # - name: kind + # value: task + # resolver: bundles + # when: + # - input: $(params.skip-checks) + # operator: in + # values: + # - "false" - name: sbom-json-check params: - name: IMAGE_URL diff --git a/.tekton/scanner-push.yaml b/.tekton/scanner-push.yaml index 3f07e5c51..ed5a3d1e9 100644 --- a/.tekton/scanner-push.yaml +++ b/.tekton/scanner-push.yaml @@ -365,28 +365,28 @@ spec: workspaces: - name: workspace workspace: workspace - - name: clamav-scan - params: - - name: image-digest - value: $(tasks.build-container.results.IMAGE_DIGEST) - - name: image-url - value: $(tasks.build-container.results.IMAGE_URL) - runAfter: - - build-container - taskRef: - params: - - name: name - value: clamav-scan - - name: bundle - value: quay.io/redhat-appstudio-tekton-catalog/task-clamav-scan:0.1@sha256:353fa2cda9855217cfcec3303973b666a10f384795630cf0eb13b874c24b0f7a - - name: kind - value: task - resolver: bundles - when: - - input: $(params.skip-checks) - operator: in - values: - - "false" + # - name: clamav-scan + # params: + # - name: image-digest + # value: $(tasks.build-container.results.IMAGE_DIGEST) + # - name: image-url + # value: $(tasks.build-container.results.IMAGE_URL) + # runAfter: + # - build-container + # taskRef: + # params: + # - name: name + # value: clamav-scan + # - name: bundle + # value: quay.io/redhat-appstudio-tekton-catalog/task-clamav-scan:0.1@sha256:353fa2cda9855217cfcec3303973b666a10f384795630cf0eb13b874c24b0f7a + # - name: kind + # value: task + # resolver: bundles + # when: + # - input: $(params.skip-checks) + # operator: in + # values: + # - "false" - name: sbom-json-check params: - name: IMAGE_URL