From 7ae227d6a5044ff4eca4e9efa3107adde5e6b752 Mon Sep 17 00:00:00 2001 From: Nicholas Richardson <29212540+richardsonnick@users.noreply.github.com> Date: Tue, 18 Aug 2026 15:02:33 -0400 Subject: [PATCH] Move tls-scanner 5.0 periodics to a release-specific variant config Sippy and Component Readiness only attribute periodic runs to a release when the jobs come from release-specific configuration. The 5.0 TLSAdherence periodic added by DPTP-5088 lived in the default release-5.0 config, which is owned by config-brancher (derived from main), so it was invisible to release dashboards and conflicted with every branching pass. Move it into openshift-tls-scanner-release-5.0__periodics.yaml per the variant periodics pattern, and add the gcp, azure, and metal adherence variants so all four platforms report into the 5.0 release view. Also add openshift-tls-scanner-release-5.1__periodics.yaml: 5.1 is now the active development release, and feature promotion tooling queries the latest development release, so the same four adherence periodics must report into the 5.1 view. The 5.1 jobs run at 24h (vs 72h for 5.0) to accumulate the 14 runs per variant required by the promotion checks within ~2 weeks. --- .../openshift-tls-scanner-release-5.0.yaml | 22 - ...ft-tls-scanner-release-5.0__periodics.yaml | 155 +++++++ ...ft-tls-scanner-release-5.1__periodics.yaml | 155 +++++++ ...ift-tls-scanner-release-5.0-periodics.yaml | 294 ++++++++++++- ...t-tls-scanner-release-5.0-postsubmits.yaml | 63 +++ ...ft-tls-scanner-release-5.0-presubmits.yaml | 58 +++ ...ift-tls-scanner-release-5.1-periodics.yaml | 385 ++++++++++++++++++ ...t-tls-scanner-release-5.1-postsubmits.yaml | 63 +++ ...ft-tls-scanner-release-5.1-presubmits.yaml | 58 +++ 9 files changed, 1229 insertions(+), 24 deletions(-) create mode 100644 ci-operator/config/openshift/tls-scanner/openshift-tls-scanner-release-5.0__periodics.yaml create mode 100644 ci-operator/config/openshift/tls-scanner/openshift-tls-scanner-release-5.1__periodics.yaml create mode 100644 ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.1-periodics.yaml diff --git a/ci-operator/config/openshift/tls-scanner/openshift-tls-scanner-release-5.0.yaml b/ci-operator/config/openshift/tls-scanner/openshift-tls-scanner-release-5.0.yaml index 6b87e60f75216..cc6b6a53b64c5 100644 --- a/ci-operator/config/openshift/tls-scanner/openshift-tls-scanner-release-5.0.yaml +++ b/ci-operator/config/openshift/tls-scanner/openshift-tls-scanner-release-5.0.yaml @@ -89,28 +89,6 @@ tests: test: - ref: tls-scanner-run workflow: openshift-e2e-aws-ovn-tls-13 -- as: periodic-tls13-adherence - interval: 72h - reporter_config: - channel: '#forum-case' - job_states_to_report: - - success - - failure - - error - report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job *{{.Spec.Job}}* - ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :warning: - Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> - {{end}}' - steps: - cluster_profile: openshift-org-aws - env: - COMPUTE_NODE_TYPE: m5.4xlarge - PQC_CHECK: "false" - TLS_13_ENABLE_TLS_ADHERENCE: "true" - TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents - test: - - ref: tls-scanner-run - workflow: openshift-e2e-aws-ovn-tls-13 - as: tls13-adherence-gcp optional: true steps: diff --git a/ci-operator/config/openshift/tls-scanner/openshift-tls-scanner-release-5.0__periodics.yaml b/ci-operator/config/openshift/tls-scanner/openshift-tls-scanner-release-5.0__periodics.yaml new file mode 100644 index 0000000000000..d40db898c479f --- /dev/null +++ b/ci-operator/config/openshift/tls-scanner/openshift-tls-scanner-release-5.0__periodics.yaml @@ -0,0 +1,155 @@ +base_images: + base: + name: "5.0" + namespace: ocp + tag: base-rhel9 + dev-scripts: + name: test + namespace: ocp-kni + tag: dev-scripts + ocp_builder_rhel-9-golang-1.25-openshift-4.22: + name: builder + namespace: ocp + tag: rhel-9-golang-1.25-openshift-4.22 +build_root: + image_stream_tag: + name: builder + namespace: ocp + tag: rhel-9-golang-1.25-openshift-4.22 +images: + items: + - dockerfile_path: Dockerfile + from: base + inputs: + ocp_builder_rhel-9-golang-1.25-openshift-4.22: {} + to: tls-scanner-tool +promotion: + to: + - disabled: true + name: "5.0" + namespace: ocp +releases: + initial: + integration: + name: "5.0" + namespace: ocp + latest: + integration: + include_built_images: true + name: "5.0" + namespace: ocp +resources: + '*': + requests: + cpu: 100m + memory: 200Mi + tls-scanner-run: + limits: + cpu: "4" + memory: 4Gi + requests: + cpu: "4" + memory: 4Gi +tests: +- as: periodic-tls13-adherence + interval: 72h + reporter_config: + channel: '#forum-case' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :warning: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> + {{end}}' + steps: + cluster_profile: openshift-org-aws + env: + COMPUTE_NODE_TYPE: m5.4xlarge + PQC_CHECK: "false" + TLS_13_ENABLE_TLS_ADHERENCE: "true" + TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents + test: + - ref: tls-scanner-run + workflow: openshift-e2e-aws-ovn-tls-13 +- as: periodic-tls13-adherence-gcp + interval: 72h + reporter_config: + channel: '#forum-case' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :warning: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> + {{end}}' + steps: + cluster_profile: openshift-org-gcp + env: + COMPUTE_NODE_TYPE: n2-standard-16 + PQC_CHECK: "false" + TLS_13_ENABLE_TLS_ADHERENCE: "true" + TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents + test: + - ref: tls-13 + - ref: tls-scanner-run + workflow: openshift-e2e-gcp-ovn +- as: periodic-tls13-adherence-azure + interval: 72h + reporter_config: + channel: '#forum-case' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :warning: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> + {{end}}' + steps: + cluster_profile: openshift-org-azure + env: + COMPUTE_NODE_TYPE: Standard_D16as_v5 + PQC_CHECK: "false" + TLS_13_ENABLE_TLS_ADHERENCE: "true" + TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents + test: + - ref: tls-13 + - ref: tls-scanner-run + workflow: openshift-e2e-azure-ovn +- as: periodic-tls13-adherence-metal + interval: 72h + reporter_config: + channel: '#forum-case' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :warning: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> + {{end}}' + steps: + cluster_profile: equinix-ocp-metal + env: + DEVSCRIPTS_CONFIG: | + IP_STACK=v4 + NETWORK_TYPE=OVNKubernetes + PQC_CHECK: "false" + SCANNER_CPU_LIMIT: "4" + SCANNER_CPU_REQUEST: 500m + SCANNER_MEM_LIMIT: 4Gi + SCANNER_MEM_REQUEST: 1Gi + TLS_13_ENABLE_TLS_ADHERENCE: "true" + TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents + test: + - ref: tls-13 + - ref: tls-scanner-run + workflow: baremetalds-e2e +zz_generated_metadata: + branch: release-5.0 + org: openshift + repo: tls-scanner + variant: periodics diff --git a/ci-operator/config/openshift/tls-scanner/openshift-tls-scanner-release-5.1__periodics.yaml b/ci-operator/config/openshift/tls-scanner/openshift-tls-scanner-release-5.1__periodics.yaml new file mode 100644 index 0000000000000..28106eeca393c --- /dev/null +++ b/ci-operator/config/openshift/tls-scanner/openshift-tls-scanner-release-5.1__periodics.yaml @@ -0,0 +1,155 @@ +base_images: + base: + name: "5.1" + namespace: ocp + tag: base-rhel9 + dev-scripts: + name: test + namespace: ocp-kni + tag: dev-scripts + ocp_builder_rhel-9-golang-1.25-openshift-4.22: + name: builder + namespace: ocp + tag: rhel-9-golang-1.25-openshift-4.22 +build_root: + image_stream_tag: + name: builder + namespace: ocp + tag: rhel-9-golang-1.25-openshift-4.22 +images: + items: + - dockerfile_path: Dockerfile + from: base + inputs: + ocp_builder_rhel-9-golang-1.25-openshift-4.22: {} + to: tls-scanner-tool +promotion: + to: + - disabled: true + name: "5.1" + namespace: ocp +releases: + initial: + integration: + name: "5.1" + namespace: ocp + latest: + integration: + include_built_images: true + name: "5.1" + namespace: ocp +resources: + '*': + requests: + cpu: 100m + memory: 200Mi + tls-scanner-run: + limits: + cpu: "4" + memory: 4Gi + requests: + cpu: "4" + memory: 4Gi +tests: +- as: periodic-tls13-adherence + interval: 24h + reporter_config: + channel: '#forum-case' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :warning: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> + {{end}}' + steps: + cluster_profile: openshift-org-aws + env: + COMPUTE_NODE_TYPE: m5.4xlarge + PQC_CHECK: "false" + TLS_13_ENABLE_TLS_ADHERENCE: "true" + TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents + test: + - ref: tls-scanner-run + workflow: openshift-e2e-aws-ovn-tls-13 +- as: periodic-tls13-adherence-gcp + interval: 24h + reporter_config: + channel: '#forum-case' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :warning: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> + {{end}}' + steps: + cluster_profile: openshift-org-gcp + env: + COMPUTE_NODE_TYPE: n2-standard-16 + PQC_CHECK: "false" + TLS_13_ENABLE_TLS_ADHERENCE: "true" + TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents + test: + - ref: tls-13 + - ref: tls-scanner-run + workflow: openshift-e2e-gcp-ovn +- as: periodic-tls13-adherence-azure + interval: 24h + reporter_config: + channel: '#forum-case' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :warning: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> + {{end}}' + steps: + cluster_profile: openshift-org-azure + env: + COMPUTE_NODE_TYPE: Standard_D16as_v5 + PQC_CHECK: "false" + TLS_13_ENABLE_TLS_ADHERENCE: "true" + TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents + test: + - ref: tls-13 + - ref: tls-scanner-run + workflow: openshift-e2e-azure-ovn +- as: periodic-tls13-adherence-metal + interval: 24h + reporter_config: + channel: '#forum-case' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :warning: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> + {{end}}' + steps: + cluster_profile: equinix-ocp-metal + env: + DEVSCRIPTS_CONFIG: | + IP_STACK=v4 + NETWORK_TYPE=OVNKubernetes + PQC_CHECK: "false" + SCANNER_CPU_LIMIT: "4" + SCANNER_CPU_REQUEST: 500m + SCANNER_MEM_LIMIT: 4Gi + SCANNER_MEM_REQUEST: 1Gi + TLS_13_ENABLE_TLS_ADHERENCE: "true" + TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents + test: + - ref: tls-13 + - ref: tls-scanner-run + workflow: baremetalds-e2e +zz_generated_metadata: + branch: release-5.1 + org: openshift + repo: tls-scanner + variant: periodics diff --git a/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.0-periodics.yaml b/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.0-periodics.yaml index 5090deeee0562..416e14e953900 100644 --- a/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.0-periodics.yaml +++ b/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.0-periodics.yaml @@ -1,6 +1,6 @@ periodics: - agent: kubernetes - cluster: build03 + cluster: build01 decorate: true decoration_config: sparse_checkout_files: @@ -15,9 +15,10 @@ periodics: labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-tls-scanner-release-5.0-periodic-tls13-adherence + name: periodic-ci-openshift-tls-scanner-release-5.0-periodics-periodic-tls13-adherence reporter_config: slack: channel: '#forum-case' @@ -38,6 +39,295 @@ periodics: - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - --target=periodic-tls13-adherence + - --variant=periodics + 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 +- agent: kubernetes + cluster: build01 + decorate: true + decoration_config: + sparse_checkout_files: + - Dockerfile + extra_refs: + - base_ref: release-5.0 + org: openshift + repo: tls-scanner + sparse_checkout_files: + - Dockerfile + interval: 72h + labels: + ci-operator.openshift.io/cloud: azure4 + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-tls-scanner-release-5.0-periodics-periodic-tls13-adherence-azure + reporter_config: + slack: + channel: '#forum-case' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :warning: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View + logs> {{end}}' + 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=periodic-tls13-adherence-azure + - --variant=periodics + 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 +- agent: kubernetes + cluster: build12 + decorate: true + decoration_config: + sparse_checkout_files: + - Dockerfile + extra_refs: + - base_ref: release-5.0 + org: openshift + repo: tls-scanner + sparse_checkout_files: + - Dockerfile + interval: 72h + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-gcp + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-tls-scanner-release-5.0-periodics-periodic-tls13-adherence-gcp + reporter_config: + slack: + channel: '#forum-case' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :warning: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View + logs> {{end}}' + 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=periodic-tls13-adherence-gcp + - --variant=periodics + 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 +- agent: kubernetes + cluster: build01 + decorate: true + decoration_config: + sparse_checkout_files: + - Dockerfile + extra_refs: + - base_ref: release-5.0 + org: openshift + repo: tls-scanner + sparse_checkout_files: + - Dockerfile + interval: 72h + labels: + ci-operator.openshift.io/cloud: equinix-ocp-metal + ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-tls-scanner-release-5.0-periodics-periodic-tls13-adherence-metal + reporter_config: + slack: + channel: '#forum-case' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :warning: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View + logs> {{end}}' + 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=periodic-tls13-adherence-metal + - --variant=periodics command: - ci-operator env: diff --git a/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.0-postsubmits.yaml b/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.0-postsubmits.yaml index 14b52eec2a789..12378f295a61c 100644 --- a/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.0-postsubmits.yaml +++ b/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.0-postsubmits.yaml @@ -61,3 +61,66 @@ postsubmits: - name: result-aggregator secret: secretName: result-aggregator + - agent: kubernetes + always_run: true + branches: + - ^release-5\.0$ + cluster: build04 + decorate: true + decoration_config: + sparse_checkout_files: + - Dockerfile + labels: + ci-operator.openshift.io/is-promotion: "true" + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-openshift-tls-scanner-release-5.0-periodics-images + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson + - --promote + - --report-credentials-file=/etc/report/credentials + - --target=[images] + - --variant=periodics + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + 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/push-secret + name: push-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: push-secret + secret: + secretName: registry-push-credentials-ci-central + - name: result-aggregator + secret: + secretName: result-aggregator diff --git a/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.0-presubmits.yaml b/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.0-presubmits.yaml index 79dfd1144421e..86d610312dd4d 100644 --- a/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.0-presubmits.yaml @@ -230,6 +230,64 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-5\.0$ + - ^release-5\.0- + cluster: build03 + context: ci/prow/periodics-images + decorate: true + decoration_config: + sparse_checkout_files: + - Dockerfile + labels: + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-tls-scanner-release-5.0-periodics-images + rerun_command: /test periodics-images + 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=[images] + - --variant=periodics + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + 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( | .* )periodics-images,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.1-periodics.yaml b/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.1-periodics.yaml new file mode 100644 index 0000000000000..d61193547de8b --- /dev/null +++ b/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.1-periodics.yaml @@ -0,0 +1,385 @@ +periodics: +- agent: kubernetes + cluster: build01 + decorate: true + decoration_config: + sparse_checkout_files: + - Dockerfile + extra_refs: + - base_ref: release-5.1 + org: openshift + repo: tls-scanner + sparse_checkout_files: + - Dockerfile + interval: 24h + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-tls-scanner-release-5.1-periodics-periodic-tls13-adherence + reporter_config: + slack: + channel: '#forum-case' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :warning: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View + logs> {{end}}' + 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=periodic-tls13-adherence + - --variant=periodics + 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 +- agent: kubernetes + cluster: build01 + decorate: true + decoration_config: + sparse_checkout_files: + - Dockerfile + extra_refs: + - base_ref: release-5.1 + org: openshift + repo: tls-scanner + sparse_checkout_files: + - Dockerfile + interval: 24h + labels: + ci-operator.openshift.io/cloud: azure4 + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-tls-scanner-release-5.1-periodics-periodic-tls13-adherence-azure + reporter_config: + slack: + channel: '#forum-case' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :warning: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View + logs> {{end}}' + 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=periodic-tls13-adherence-azure + - --variant=periodics + 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 +- agent: kubernetes + cluster: build12 + decorate: true + decoration_config: + sparse_checkout_files: + - Dockerfile + extra_refs: + - base_ref: release-5.1 + org: openshift + repo: tls-scanner + sparse_checkout_files: + - Dockerfile + interval: 24h + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-gcp + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-tls-scanner-release-5.1-periodics-periodic-tls13-adherence-gcp + reporter_config: + slack: + channel: '#forum-case' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :warning: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View + logs> {{end}}' + 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=periodic-tls13-adherence-gcp + - --variant=periodics + 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 +- agent: kubernetes + cluster: build01 + decorate: true + decoration_config: + sparse_checkout_files: + - Dockerfile + extra_refs: + - base_ref: release-5.1 + org: openshift + repo: tls-scanner + sparse_checkout_files: + - Dockerfile + interval: 24h + labels: + ci-operator.openshift.io/cloud: equinix-ocp-metal + ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-tls-scanner-release-5.1-periodics-periodic-tls13-adherence-metal + reporter_config: + slack: + channel: '#forum-case' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :warning: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View + logs> {{end}}' + 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=periodic-tls13-adherence-metal + - --variant=periodics + 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 diff --git a/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.1-postsubmits.yaml b/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.1-postsubmits.yaml index 57ae0b8fedced..d3a382db1e091 100644 --- a/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.1-postsubmits.yaml +++ b/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.1-postsubmits.yaml @@ -61,3 +61,66 @@ postsubmits: - name: result-aggregator secret: secretName: result-aggregator + - agent: kubernetes + always_run: true + branches: + - ^release-5\.1$ + cluster: build04 + decorate: true + decoration_config: + sparse_checkout_files: + - Dockerfile + labels: + ci-operator.openshift.io/is-promotion: "true" + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-openshift-tls-scanner-release-5.1-periodics-images + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson + - --promote + - --report-credentials-file=/etc/report/credentials + - --target=[images] + - --variant=periodics + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + 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/push-secret + name: push-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: push-secret + secret: + secretName: registry-push-credentials-ci-central + - name: result-aggregator + secret: + secretName: result-aggregator diff --git a/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.1-presubmits.yaml b/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.1-presubmits.yaml index d258427d8e7a8..0f858604c54aa 100644 --- a/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.1-presubmits.yaml +++ b/ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-release-5.1-presubmits.yaml @@ -229,6 +229,64 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-5\.1$ + - ^release-5\.1- + cluster: build03 + context: ci/prow/periodics-images + decorate: true + decoration_config: + sparse_checkout_files: + - Dockerfile + labels: + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-tls-scanner-release-5.1-periodics-images + rerun_command: /test periodics-images + 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=[images] + - --variant=periodics + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + 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( | .* )periodics-images,?($|\s.*) - agent: kubernetes always_run: true branches: