ci-operator/step-registry/ipi/conf: Split out per-platform steps

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

@@ -195,8 +195,8 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-steps
+- as: e2e-aws-steps
   commands: ""
   steps:
     cluster_profile: aws
-    workflow: origin-e2e
+    workflow: origin-e2e-aws

ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.4.yaml

@@ -191,8 +191,8 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-steps
+- as: e2e-aws-steps
   commands: ""
   steps:
     cluster_profile: aws
-    workflow: origin-e2e
+    workflow: origin-e2e-aws

ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.5.yaml

@@ -196,8 +196,8 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-steps
+- as: e2e-aws-steps
   commands: ""
   steps:
     cluster_profile: aws
-    workflow: origin-e2e
+    workflow: origin-e2e-aws

ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.6.yaml

@@ -195,8 +195,8 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-steps
+- as: e2e-aws-steps
   commands: ""
   steps:
     cluster_profile: aws
-    workflow: origin-e2e
+    workflow: origin-e2e-aws

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

@@ -194,8 +194,8 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-steps
+- as: e2e-aws-steps
   commands: ""
   steps:
     cluster_profile: aws
-    workflow: origin-e2e
+    workflow: origin-e2e-aws

ci-operator/config/openshift/installer/openshift-installer-release-4.4.yaml

@@ -190,8 +190,8 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-steps
+- as: e2e-aws-steps
   commands: ""
   steps:
     cluster_profile: aws
-    workflow: origin-e2e
+    workflow: origin-e2e-aws

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

@@ -195,8 +195,8 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-steps
+- as: e2e-aws-steps
   commands: ""
   steps:
     cluster_profile: aws
-    workflow: origin-e2e
+    workflow: origin-e2e-aws

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

@@ -194,8 +194,8 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-steps
+- as: e2e-aws-steps
   commands: ""
   steps:
     cluster_profile: aws
-    workflow: origin-e2e
+    workflow: origin-e2e-aws

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

@@ -313,6 +313,94 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )e2e-aws-scaleup-rhel7,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    context: ci/prow/e2e-aws-steps
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    hidden: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-installer-master-e2e-aws-steps
+    path_alias: github.com/openshift/installer
+    rerun_command: /test e2e-aws-steps
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --branch=master
+        - --give-pr-author-access-to-namespace=true
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --kubeconfig=/etc/apici/kubeconfig
+        - --lease-server-password-file=/etc/boskos/password
+        - --lease-server-username=ci
+        - --lease-server=https://boskos-ci.svc.ci.openshift.org
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --org=openshift-priv
+        - --repo=installer
+        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
+        - --secret-dir=/usr/local/e2e-aws-steps-cluster-profile
+        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
+        - --target=e2e-aws-steps
+        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-aws-steps-cluster-profile
+          name: cluster-profile
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/sentry-dsn
+          name: sentry-dsn
+          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-aws
+      - name: github-credentials-openshift-ci-robot-private-git-cloner
+        secret:
+          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
+        secret:
+          secretName: regcred
+      - name: sentry-dsn
+        secret:
+          secretName: sentry-dsn
+    trigger: (?m)^/test( | .* )e2e-aws-steps,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -1005,94 +1093,6 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )e2e-gcp-upi,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - master
-    context: ci/prow/e2e-steps
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-installer-master-e2e-steps
-    path_alias: github.com/openshift/installer
-    rerun_command: /test e2e-steps
-    spec:
-      containers:
-      - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --branch=master
-        - --give-pr-author-access-to-namespace=true
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --kubeconfig=/etc/apici/kubeconfig
-        - --lease-server-password-file=/etc/boskos/password
-        - --lease-server-username=ci
-        - --lease-server=https://boskos-ci.svc.ci.openshift.org
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --org=openshift-priv
-        - --repo=installer
-        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
-        - --secret-dir=/usr/local/e2e-steps-cluster-profile
-        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-steps
-        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-steps-cluster-profile
-          name: cluster-profile
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/sentry-dsn
-          name: sentry-dsn
-          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-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: regcred
-      - name: sentry-dsn
-        secret:
-          secretName: sentry-dsn
-    trigger: (?m)^/test( | .* )e2e-steps,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: