Rename VSphere UPI job to e2e-vsphere-upi.

ci-operator/config/openshift/installer/openshift-installer-master.yaml

@@ -190,7 +190,7 @@ tests:
   openshift_installer:
     cluster_profile: gcp
     upgrade: true
-- as: e2e-vsphere
+- as: e2e-vsphere-upi
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
@@ -202,7 +202,7 @@ tests:
   steps:
     cluster_profile: packet
     workflow: baremetalds-e2e
-- as: e2e-vsphere-steps
+- as: e2e-vsphere
   steps:
     cluster_profile: vsphere
     workflow: origin-e2e-vsphere

ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml

@@ -2205,16 +2205,8 @@ presubmits:
         - --secret-dir=/usr/local/e2e-vsphere-cluster-profile
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
         - --target=e2e-vsphere
-        - --template=/usr/local/e2e-vsphere
         command:
         - ci-operator
-        env:
-        - name: CLUSTER_TYPE
-          value: vsphere
-        - name: JOB_NAME_SAFE
-          value: e2e-vsphere
-        - name: TEST_COMMAND
-          value: TEST_SUITE=openshift/conformance/parallel run-tests
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -2230,9 +2222,6 @@ presubmits:
           readOnly: true
         - mountPath: /usr/local/e2e-vsphere-cluster-profile
           name: cluster-profile
-        - mountPath: /usr/local/e2e-vsphere
-          name: job-definition
-          subPath: cluster-launch-installer-upi-e2e.yaml
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -2258,9 +2247,6 @@ presubmits:
           sources:
           - secret:
               name: cluster-secrets-vsphere
-      - configMap:
-          name: prow-job-cluster-launch-installer-upi-e2e
-        name: job-definition
       - name: pull-secret
         secret:
           secretName: regcred
@@ -2273,16 +2259,16 @@ presubmits:
     branches:
     - master
     cluster: api.ci
-    context: ci/prow/e2e-vsphere-steps
+    context: ci/prow/e2e-vsphere-upi
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-installer-master-e2e-vsphere-steps
+    name: pull-ci-openshift-installer-master-e2e-vsphere-upi
     optional: true
-    rerun_command: /test e2e-vsphere-steps
+    rerun_command: /test e2e-vsphere-upi
     spec:
       containers:
       - args:
@@ -2293,11 +2279,19 @@ presubmits:
         - --lease-server-password-file=/etc/boskos/password
         - --lease-server-username=ci
         - --lease-server=https://boskos-ci.svc.ci.openshift.org
-        - --secret-dir=/usr/local/e2e-vsphere-steps-cluster-profile
+        - --secret-dir=/usr/local/e2e-vsphere-upi-cluster-profile
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-vsphere-steps
+        - --target=e2e-vsphere-upi
+        - --template=/usr/local/e2e-vsphere-upi
         command:
         - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: vsphere
+        - name: JOB_NAME_SAFE
+          value: e2e-vsphere-upi
+        - name: TEST_COMMAND
+          value: TEST_SUITE=openshift/conformance/parallel run-tests
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -2311,8 +2305,11 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-vsphere-steps-cluster-profile
+        - mountPath: /usr/local/e2e-vsphere-upi-cluster-profile
           name: cluster-profile
+        - mountPath: /usr/local/e2e-vsphere-upi
+          name: job-definition
+          subPath: cluster-launch-installer-upi-e2e.yaml
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -2338,13 +2335,16 @@ presubmits:
           sources:
           - secret:
               name: cluster-secrets-vsphere
+      - configMap:
+          name: prow-job-cluster-launch-installer-upi-e2e
+        name: job-definition
       - name: pull-secret
         secret:
           secretName: regcred
       - name: sentry-dsn
         secret:
           secretName: sentry-dsn
-    trigger: (?m)^/test( | .* )e2e-vsphere-steps,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-vsphere-upi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: