diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main.yaml index 7376afc20c077..d4ed3d3f2d933 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main.yaml @@ -39,6 +39,10 @@ base_images: name: "5.0" namespace: ocp tag: rhel-coreos + tls-scanner-tool: + name: "5.0" + namespace: ocp + tag: tls-scanner-tool build_root: from_repository: true images: @@ -766,6 +770,19 @@ tests: DISK_SETUP: "true" FEATURE_SET: TechPreviewNoUpgrade workflow: openshift-e2e-vsphere +- always_run: false + as: tls-pqc-readiness + optional: true + steps: + cluster_profile: openshift-org-aws + env: + PQC_CHECK: "true" + SCAN_NAMESPACE: openshift-machine-config-operator + SCANNER_CPU: "2" + test: + - ref: tls-13 + - ref: tls-scanner-run + workflow: ipi-aws zz_generated_metadata: branch: main org: openshift diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0.yaml index 4cc68e3628a82..45ac1e3f3906d 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0.yaml @@ -39,6 +39,10 @@ base_images: name: "5.0" namespace: ocp tag: rhel-coreos + tls-scanner-tool: + name: "5.0" + namespace: ocp + tag: tls-scanner-tool build_root: from_repository: true images: @@ -767,6 +771,19 @@ tests: DISK_SETUP: "true" FEATURE_SET: TechPreviewNoUpgrade workflow: openshift-e2e-vsphere +- always_run: false + as: tls-pqc-readiness + optional: true + steps: + cluster_profile: openshift-org-aws + env: + PQC_CHECK: "true" + SCAN_NAMESPACE: openshift-machine-config-operator + SCANNER_CPU: "2" + test: + - ref: tls-13 + - ref: tls-scanner-run + workflow: ipi-aws zz_generated_metadata: branch: release-5.0 org: openshift diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-main-presubmits.yaml index 34847bdba51b4..2706792639c6d 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-main-presubmits.yaml @@ -5484,6 +5484,91 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )security,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build10 + context: ci/prow/tls-pqc-readiness + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-config-operator-main-tls-pqc-readiness + optional: true + rerun_command: /test tls-pqc-readiness + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=tls-pqc-readiness + 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: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - 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: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - 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-pqc-readiness,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0-presubmits.yaml index 479dc9444d240..a8f29a99febab 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0-presubmits.yaml @@ -5458,6 +5458,91 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )security,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-5\.0$ + - ^release-5\.0- + cluster: build09 + context: ci/prow/tls-pqc-readiness + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel7 + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-config-operator-release-5.0-tls-pqc-readiness + optional: true + rerun_command: /test tls-pqc-readiness + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=tls-pqc-readiness + 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: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - 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: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - 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-pqc-readiness,?($|\s.*) - agent: kubernetes always_run: true branches: