diff --git a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml index 226b9738373cf..e13bb9c25ff1d 100644 --- a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml +++ b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml @@ -237,12 +237,13 @@ tests: cpu: 100m workflow: openshift-e2e-azure - always_run: false - as: e2e-vsphere-capi-techpreview + as: e2e-vsphere-capi-customnoupgrade-migration pipeline_skip_if_only_changed: \.md$|(^|/)docs/|(^|/)LICENSE$|(^|/)manifests-gen/|(^|/)OWNERS$ steps: cluster_profile: vsphere-elastic env: - FEATURE_SET: TechPreviewNoUpgrade + FEATURE_GATES: '["MachineAPIMigration=true","MachineAPIMigrationVSphere=true","ClusterAPIMachineManagement=true","ClusterAPIMachineManagementVSphere=true"]' + FEATURE_SET: CustomNoUpgrade test: - as: test commands: make e2e diff --git a/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main-presubmits.yaml index 421980b0b352b..159b845eb8d28 100644 --- a/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main-presubmits.yaml @@ -1454,7 +1454,7 @@ presubmits: - ^main$ - ^main- cluster: vsphere02 - context: ci/prow/e2e-vsphere-capi-techpreview + context: ci/prow/e2e-vsphere-capi-customnoupgrade-migration decorate: true decoration_config: sparse_checkout_files: @@ -1465,8 +1465,8 @@ presubmits: 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-cluster-capi-operator-main-e2e-vsphere-capi-techpreview - rerun_command: /test e2e-vsphere-capi-techpreview + name: pull-ci-openshift-cluster-capi-operator-main-e2e-vsphere-capi-customnoupgrade-migration + rerun_command: /test e2e-vsphere-capi-customnoupgrade-migration spec: containers: - args: @@ -1475,7 +1475,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-vsphere-capi-techpreview + - --target=e2e-vsphere-capi-customnoupgrade-migration command: - ci-operator env: @@ -1531,7 +1531,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-vsphere-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-vsphere-capi-customnoupgrade-migration,?($|\s.*) - agent: kubernetes always_run: true branches: