Add optional vSphere IPI tests for MCO

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

@@ -59,7 +59,7 @@ tests:
     run-tests
   openshift_installer:
     cluster_profile: aws
-- as: e2e-vsphere
+- as: e2e-vsphere-upi
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
@@ -71,6 +71,10 @@ tests:
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
+- as: e2e-vsphere
+  steps:
+    cluster_profile: vsphere
+    workflow: openshift-e2e-vsphere
 zz_generated_metadata:
   branch: master
   org: openshift

ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.5.yaml

@@ -59,7 +59,7 @@ tests:
     run-tests
   openshift_installer:
     cluster_profile: aws
-- as: e2e-vsphere
+- as: e2e-vsphere-upi
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
@@ -71,6 +71,10 @@ tests:
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
+- as: e2e-vsphere
+  steps:
+    cluster_profile: vsphere
+    workflow: openshift-e2e-vsphere
 zz_generated_metadata:
   branch: release-4.5
   org: openshift

ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6.yaml

@@ -60,7 +60,7 @@ tests:
     run-tests
   openshift_installer:
     cluster_profile: aws
-- as: e2e-vsphere
+- as: e2e-vsphere-upi
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
@@ -72,6 +72,10 @@ tests:
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
+- as: e2e-vsphere
+  steps:
+    cluster_profile: vsphere
+    workflow: openshift-e2e-vsphere
 zz_generated_metadata:
   branch: release-4.6
   org: openshift

ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.7.yaml

@@ -59,7 +59,7 @@ tests:
     run-tests
   openshift_installer:
     cluster_profile: aws
-- as: e2e-vsphere
+- as: e2e-vsphere-upi
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
@@ -71,6 +71,10 @@ tests:
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
+- as: e2e-vsphere
+  steps:
+    cluster_profile: vsphere
+    workflow: openshift-e2e-vsphere
 zz_generated_metadata:
   branch: release-4.7
   org: openshift

ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml

@@ -759,14 +759,88 @@ presubmits:
         - --report-username=ci
         - --secret-dir=/usr/local/e2e-vsphere-cluster-profile
         - --target=e2e-vsphere
-        - --template=/usr/local/e2e-vsphere
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/apici
+          name: apici-ci-operator-credentials
+          readOnly: true
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-vsphere-cluster-profile
+          name: cluster-profile
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: apici-ci-operator-credentials
+        secret:
+          items:
+          - key: sa.ci-operator.apici.config
+            path: kubeconfig
+          secretName: apici-ci-operator-credentials
+      - name: boskos
+        secret:
+          items:
+          - key: password
+            path: password
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-vsphere
+      - name: pull-secret
+        secret:
+          secretName: regcred
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - master
+    cluster: api.ci
+    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-machine-config-operator-master-e2e-vsphere-upi
+    optional: true
+    rerun_command: /test e2e-vsphere-upi
+    spec:
+      containers:
+      - args:
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --kubeconfig=/etc/apici/kubeconfig
+        - --lease-server-password-file=/etc/boskos/password
+        - --report-password-file=/etc/report/password.txt
+        - --report-username=ci
+        - --secret-dir=/usr/local/e2e-vsphere-upi-cluster-profile
+        - --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
+          value: e2e-vsphere-upi
         - name: TEST_COMMAND
           value: TEST_SUITE=openshift/conformance/parallel run-tests
         image: ci-operator:latest
@@ -782,9 +856,9 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-vsphere-cluster-profile
+        - mountPath: /usr/local/e2e-vsphere-upi-cluster-profile
           name: cluster-profile
-        - mountPath: /usr/local/e2e-vsphere
+        - mountPath: /usr/local/e2e-vsphere-upi
           name: job-definition
           subPath: cluster-launch-installer-upi-e2e.yaml
         - mountPath: /etc/pull-secret
@@ -821,7 +895,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-vsphere-upi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.5-presubmits.yaml

@@ -675,14 +675,88 @@ presubmits:
         - --report-username=ci
         - --secret-dir=/usr/local/e2e-vsphere-cluster-profile
         - --target=e2e-vsphere
-        - --template=/usr/local/e2e-vsphere
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/apici
+          name: apici-ci-operator-credentials
+          readOnly: true
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-vsphere-cluster-profile
+          name: cluster-profile
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: apici-ci-operator-credentials
+        secret:
+          items:
+          - key: sa.ci-operator.apici.config
+            path: kubeconfig
+          secretName: apici-ci-operator-credentials
+      - name: boskos
+        secret:
+          items:
+          - key: password
+            path: password
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-vsphere
+      - name: pull-secret
+        secret:
+          secretName: regcred
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - release-4.5
+    cluster: api.ci
+    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-machine-config-operator-release-4.5-e2e-vsphere-upi
+    optional: true
+    rerun_command: /test e2e-vsphere-upi
+    spec:
+      containers:
+      - args:
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --kubeconfig=/etc/apici/kubeconfig
+        - --lease-server-password-file=/etc/boskos/password
+        - --report-password-file=/etc/report/password.txt
+        - --report-username=ci
+        - --secret-dir=/usr/local/e2e-vsphere-upi-cluster-profile
+        - --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
+          value: e2e-vsphere-upi
         - name: TEST_COMMAND
           value: TEST_SUITE=openshift/conformance/parallel run-tests
         image: ci-operator:latest
@@ -698,9 +772,9 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-vsphere-cluster-profile
+        - mountPath: /usr/local/e2e-vsphere-upi-cluster-profile
           name: cluster-profile
-        - mountPath: /usr/local/e2e-vsphere
+        - mountPath: /usr/local/e2e-vsphere-upi
           name: job-definition
           subPath: cluster-launch-installer-upi-e2e.yaml
         - mountPath: /etc/pull-secret
@@ -737,7 +811,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-vsphere-upi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: