From 8c28863e415ecdd64634ba2815b05a9f8009e8f7 Mon Sep 17 00:00:00 2001 From: Kui Wang Date: Fri, 12 Sep 2025 14:43:48 +0800 Subject: [PATCH] add presubmit job for olmv0 based on ote --- ...openshift-operator-framework-olm-main.yaml | 29 +++- ...perator-framework-olm-main-presubmits.yaml | 139 +++++++++++++++++- 2 files changed, 162 insertions(+), 6 deletions(-) diff --git a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-main.yaml b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-main.yaml index 9ba6a24b264f3..eecb35dcb359b 100755 --- a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-main.yaml +++ b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-main.yaml @@ -101,7 +101,7 @@ tests: container: from: ci-image - as: e2e-gcp-olm - skip_if_only_changed: ^docs/|\.md$|^(?:.*\/)?(?:\.gitignore|DOWNSTREAM_OWNERS|DOWNSTREAM_OWNERS_ALIASES|LICENSE|DCO)|\.golangci\.yaml|Tiltfile$ + skip_if_only_changed: ^docs/|\.md$|^(?:.*\/)?(?:\.gitignore|DOWNSTREAM_OWNERS|DOWNSTREAM_OWNERS_ALIASES|LICENSE|DCO)|\.golangci\.yaml|Tiltfile$|^(?:.*\/)?tests-extension\/ steps: cluster_profile: gcp-3 test: @@ -131,7 +131,7 @@ tests: workflow: ipi-gcp - as: e2e-gcp-olm-flaky optional: true - skip_if_only_changed: ^docs/|\.md$|^(?:.*\/)?(?:\.gitignore|DOWNSTREAM_OWNERS|DOWNSTREAM_OWNERS_ALIASES|LICENSE|DCO)|\.golangci\.yaml|Tiltfile$ + skip_if_only_changed: ^docs/|\.md$|^(?:.*\/)?(?:\.gitignore|DOWNSTREAM_OWNERS|DOWNSTREAM_OWNERS_ALIASES|LICENSE|DCO)|\.golangci\.yaml|Tiltfile$|^(?:.*\/)?tests-extension\/ steps: cluster_profile: gcp test: @@ -144,7 +144,7 @@ tests: cpu: 100m workflow: ipi-gcp - as: e2e-gcp-console-olm - skip_if_only_changed: ^docs/|\.md$|^(?:.*\/)?(?:\.gitignore|DOWNSTREAM_OWNERS|DOWNSTREAM_OWNERS_ALIASES|LICENSE|DCO)|\.golangci\.yaml|Tiltfile$ + skip_if_only_changed: ^docs/|\.md$|^(?:.*\/)?(?:\.gitignore|DOWNSTREAM_OWNERS|DOWNSTREAM_OWNERS_ALIASES|LICENSE|DCO)|\.golangci\.yaml|Tiltfile$|^(?:.*\/)?tests-extension\/ steps: cluster_profile: gcp test: @@ -167,6 +167,29 @@ tests: CHECK_MOD_LIST: "false" test: - ref: go-verify-deps +- as: tests-extension + run_if_changed: ^(tests-extension/) + steps: + test: + - as: sanity + commands: | + cd tests-extension + make verify + make build + make verify-metadata + from: src + resources: + requests: + cpu: 100m +- as: e2e-aws-olmv0-ext + steps: + cluster_profile: aws-2 + env: + TEST_ARGS: --monitor=watch-namespaces + TEST_SUITE: olmv0/all + test: + - ref: openshift-e2e-test + workflow: openshift-e2e-aws zz_generated_metadata: branch: main org: openshift diff --git a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-main-presubmits.yaml b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-main-presubmits.yaml index 279e8ec8fd302..4c570fef96fd3 100644 --- a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-main-presubmits.yaml @@ -1,5 +1,77 @@ presubmits: openshift/operator-framework-olm: + - agent: kubernetes + always_run: true + branches: + - ^main$ + - ^main- + cluster: build09 + context: ci/prow/e2e-aws-olmv0-ext + decorate: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-operator-framework-olm-main-e2e-aws-olmv0-ext + rerun_command: /test e2e-aws-olmv0-ext + 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=e2e-aws-olmv0-ext + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + 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( | .* )e2e-aws-olmv0-ext,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -15,7 +87,7 @@ presubmits: pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-operator-framework-olm-main-e2e-gcp-console-olm rerun_command: /test e2e-gcp-console-olm - skip_if_only_changed: ^docs/|\.md$|^(?:.*\/)?(?:\.gitignore|DOWNSTREAM_OWNERS|DOWNSTREAM_OWNERS_ALIASES|LICENSE|DCO)|\.golangci\.yaml|Tiltfile$ + skip_if_only_changed: ^docs/|\.md$|^(?:.*\/)?(?:\.gitignore|DOWNSTREAM_OWNERS|DOWNSTREAM_OWNERS_ALIASES|LICENSE|DCO)|\.golangci\.yaml|Tiltfile$|^(?:.*\/)?tests-extension\/ spec: containers: - args: @@ -88,7 +160,7 @@ presubmits: pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-operator-framework-olm-main-e2e-gcp-olm rerun_command: /test e2e-gcp-olm - skip_if_only_changed: ^docs/|\.md$|^(?:.*\/)?(?:\.gitignore|DOWNSTREAM_OWNERS|DOWNSTREAM_OWNERS_ALIASES|LICENSE|DCO)|\.golangci\.yaml|Tiltfile$ + skip_if_only_changed: ^docs/|\.md$|^(?:.*\/)?(?:\.gitignore|DOWNSTREAM_OWNERS|DOWNSTREAM_OWNERS_ALIASES|LICENSE|DCO)|\.golangci\.yaml|Tiltfile$|^(?:.*\/)?tests-extension\/ spec: containers: - args: @@ -162,7 +234,7 @@ presubmits: name: pull-ci-openshift-operator-framework-olm-main-e2e-gcp-olm-flaky optional: true rerun_command: /test e2e-gcp-olm-flaky - skip_if_only_changed: ^docs/|\.md$|^(?:.*\/)?(?:\.gitignore|DOWNSTREAM_OWNERS|DOWNSTREAM_OWNERS_ALIASES|LICENSE|DCO)|\.golangci\.yaml|Tiltfile$ + skip_if_only_changed: ^docs/|\.md$|^(?:.*\/)?(?:\.gitignore|DOWNSTREAM_OWNERS|DOWNSTREAM_OWNERS_ALIASES|LICENSE|DCO)|\.golangci\.yaml|Tiltfile$|^(?:.*\/)?tests-extension\/ spec: containers: - args: @@ -611,6 +683,67 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )periodics-images,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build06 + context: ci/prow/tests-extension + decorate: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-operator-framework-olm-main-tests-extension + rerun_command: /test tests-extension + run_if_changed: ^(tests-extension/) + 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 + - --secret-dir=/secrets/ci-pull-credentials + - --target=tests-extension + 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/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: 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( | .* )tests-extension,?($|\s.*) - agent: kubernetes always_run: true branches: