diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-main.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-main.yaml index 932cb1919a3be..f97393ad2c2d8 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-main.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-main.yaml @@ -282,10 +282,20 @@ tests: steps: cluster_profile: vsphere-elastic env: - POOLS: vcenter.ci.ibmc.devcluster.openshift.com-cidatacenter-cicluster vcenter.ci.ibmc.devcluster.openshift.com-cidatacenter-1-cicluster-1 - vcenter-1.ci.ibmc.devcluster.openshift.com-cidatacenter-2-cicluster-3 + MAX_VCENTERS: "3" TEST_SKIPS: 'In-tree Volumes \[Driver: vsphere\]' workflow: openshift-e2e-vsphere-multi-vcenter +- always_run: false + as: e2e-vsphere-ovn-multi-vcenter-serial + optional: true + steps: + cluster_profile: vsphere-elastic + env: + MAX_VCENTERS: "3" + TEST_SKIPS: "" + TEST_SUITE: openshift/conformance/serial + workflow: openshift-e2e-vsphere-multi-vcenter + timeout: 6h0m0s - always_run: false as: e2e-vsphere-operator optional: true diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-main-presubmits.yaml index 334590123887f..17022df49b3e6 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-main-presubmits.yaml @@ -2301,6 +2301,111 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-vsphere-ovn-multi-vcenter,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: vsphere02 + context: ci/prow/e2e-vsphere-ovn-multi-vcenter-serial + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.rhel + timeout: 6h0m0s + labels: + ci-operator.openshift.io/cloud: vsphere + ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-api-operator-main-e2e-vsphere-ovn-multi-vcenter-serial + optional: true + rerun_command: /test e2e-vsphere-ovn-multi-vcenter-serial + spec: + containers: + - args: + - --enable-secrets-store-csi-driver=true + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --gsm-config=/etc/gsm-config/gsm-config.yaml + - --gsm-credentials-file=/etc/gsm-credentials/key.json + - --gsm-project-config=/etc/gsm-config/gsm-project-config.yaml + - --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-vsphere-ovn-multi-vcenter-serial + 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: /etc/gsm-config + name: gsm-config + readOnly: true + - mountPath: /etc/gsm-credentials + name: gsm-sa-key + 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 + - configMap: + name: gsm-config + name: gsm-config + - csi: + driver: secrets-store.csi.k8s.io + readOnly: true + volumeAttributes: + secretProviderClass: ci-operator-sa-key-spc + name: gsm-sa-key + - 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-vsphere-ovn-multi-vcenter-serial,?($|\s.*) - agent: kubernetes always_run: false branches: