diff --git a/ci-operator/config/openshift/lightspeed-service/openshift-lightspeed-service-main.yaml b/ci-operator/config/openshift/lightspeed-service/openshift-lightspeed-service-main.yaml index e793ef770439f..c99c92126a324 100644 --- a/ci-operator/config/openshift/lightspeed-service/openshift-lightspeed-service-main.yaml +++ b/ci-operator/config/openshift/lightspeed-service/openshift-lightspeed-service-main.yaml @@ -8,6 +8,13 @@ images: items: - dockerfile_path: Containerfile to: lightspeed-service-api + - dockerfile_literal: | + FROM quay.io/openshift-lightspeed/ols-qe:tls-scanner AS scanner + FROM src + COPY --from=scanner /usr/local/bin/tls-scanner /usr/local/bin/tls-scanner + COPY --from=scanner /opt/testssl /opt/testssl + from: src + to: tls-scan-src promotion: to: - namespace: ols @@ -31,6 +38,12 @@ tests: container: from: src skip_if_only_changed: ^docs/|\.md$|^\.tekton/|^\.github/|^hack/|^(?:.*/)?(?:\.gitignore|\.snyk|\.dockerignore|OWNERS|PROJECT|LICENSE)$ +- as: tls-scan + commands: unset KUBERNETES_SERVICE_HOST KUBERNETES_SERVICE_PORT && make install-deps + && make tls-scan + container: + from: tls-scan-src + skip_if_only_changed: ^docs/|\.md$|^\.tekton/|^\.github/|^hack/|^(?:.*/)?(?:\.gitignore|\.snyk|\.dockerignore|OWNERS|PROJECT|LICENSE)$ - as: unit commands: | export CODECOV_TOKEN=$(cat /tmp/secret/CODECOV_TOKEN) diff --git a/ci-operator/jobs/openshift/lightspeed-service/openshift-lightspeed-service-main-presubmits.yaml b/ci-operator/jobs/openshift/lightspeed-service/openshift-lightspeed-service-main-presubmits.yaml index 3beb04b913b2d..66c3110518f6b 100644 --- a/ci-operator/jobs/openshift/lightspeed-service/openshift-lightspeed-service-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/lightspeed-service/openshift-lightspeed-service-main-presubmits.yaml @@ -470,6 +470,71 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )security,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build12 + context: ci/prow/tls-scan + decorate: true + decoration_config: + sparse_checkout_files: + - Containerfile + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-lightspeed-service-main-tls-scan + rerun_command: /test tls-scan + skip_if_only_changed: ^docs/|\.md$|^\.tekton/|^\.github/|^hack/|^(?:.*/)?(?:\.gitignore|\.snyk|\.dockerignore|OWNERS|PROJECT|LICENSE)$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --target=tls-scan + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )tls-scan,?($|\s.*) - agent: kubernetes always_run: false branches: