Always run RHEL scaleup in installer, MCO & MAO

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

@@ -100,7 +100,7 @@ tests:
   openshift_installer:
     cluster_profile: aws
     upgrade: true
-- as: e2e-rhel-scaleup
+- as: e2e-aws-scaleup-rhel7
   commands: TEST_SUITE=openshift/conformance run-tests
   openshift_ansible_40:
     cluster_profile: aws-centos-40

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

@@ -95,7 +95,7 @@ tests:
   openshift_installer:
     cluster_profile: aws
     upgrade: false
-- as: e2e-rhel-scaleup
+- as: e2e-aws-scaleup-rhel7
   commands: TEST_SUITE=openshift/conformance run-tests
   openshift_ansible_40:
     cluster_profile: aws-centos-40

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

@@ -96,7 +96,7 @@ tests:
   openshift_installer:
     cluster_profile: aws
     upgrade: false
-- as: e2e-rhel-scaleup
+- as: e2e-aws-scaleup-rhel7
   commands: TEST_SUITE=openshift/conformance run-tests
   openshift_ansible_40:
     cluster_profile: aws-centos-40

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

@@ -62,7 +62,7 @@ tests:
   openshift_installer:
     cluster_profile: aws
     upgrade: true
-- as: e2e-rhel-scaleup
+- as: e2e-aws-scaleup-rhel7
   commands: TEST_SUITE=openshift/conformance run-tests
   openshift_ansible_40:
     cluster_profile: aws-centos-40

ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.0.yaml

@@ -57,7 +57,7 @@ tests:
   commands: make test-e2e
   openshift_installer_src:
     cluster_profile: aws
-- as: e2e-rhel-scaleup
+- as: e2e-aws-scaleup-rhel7
   commands: TEST_SUITE=openshift/conformance run-tests
   openshift_ansible_40:
     cluster_profile: aws-centos-40

ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.1.yaml

@@ -58,7 +58,7 @@ tests:
   commands: make test-e2e
   openshift_installer_src:
     cluster_profile: aws
-- as: e2e-rhel-scaleup
+- as: e2e-aws-scaleup-rhel7
   commands: TEST_SUITE=openshift/conformance run-tests
   openshift_ansible_40:
     cluster_profile: aws-centos-40

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

@@ -65,7 +65,7 @@ tests:
   openshift_installer:
     cluster_profile: aws
     upgrade: true
-- as: e2e-rhel-scaleup
+- as: e2e-aws-scaleup-rhel7
   commands: TEST_SUITE=openshift/conformance run-tests
   openshift_ansible_40:
     cluster_profile: aws-centos-40

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

@@ -60,7 +60,7 @@ tests:
   commands: make test-e2e
   openshift_installer_src:
     cluster_profile: aws
-- as: e2e-rhel-scaleup
+- as: e2e-aws-scaleup-rhel7
   commands: TEST_SUITE=openshift/conformance run-tests
   openshift_ansible_40:
     cluster_profile: aws-centos-40

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

@@ -61,7 +61,7 @@ tests:
   commands: make test-e2e
   openshift_installer_src:
     cluster_profile: aws
-- as: e2e-rhel-scaleup
+- as: e2e-aws-scaleup-rhel7
   commands: TEST_SUITE=openshift/conformance run-tests
   openshift_ansible_40:
     cluster_profile: aws-centos-40

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

@@ -156,6 +156,67 @@ presubmits:
           name: prow-job-cluster-launch-installer-e2e
         name: job-definition
     trigger: '(?m)^/test (?:.*? )?e2e-aws-rhel8(?: .*?)?$'
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    context: ci/prow/e2e-aws-scaleup-rhel7
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+    name: pull-ci-openshift-installer-master-e2e-aws-scaleup-rhel7
+    rerun_command: /test e2e-aws-scaleup-rhel7
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --give-pr-author-access-to-namespace=true
+        - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile
+        - --target=e2e-aws-scaleup-rhel7
+        - --template=/usr/local/e2e-aws-scaleup-rhel7
+        command:
+        - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: aws
+        - name: CONFIG_SPEC
+          valueFrom:
+            configMapKeyRef:
+              key: openshift-installer-master.yaml
+              name: ci-operator-master-configs
+        - name: JOB_NAME_SAFE
+          value: e2e-aws-scaleup-rhel7
+        - name: RPM_REPO_OPENSHIFT_ORIGIN
+          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/
+        - name: TEST_COMMAND
+          value: TEST_SUITE=openshift/conformance run-tests
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile
+          name: cluster-profile
+        - mountPath: /usr/local/e2e-aws-scaleup-rhel7
+          name: job-definition
+          subPath: cluster-scaleup-e2e-40.yaml
+      serviceAccountName: ci-operator
+      volumes:
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+          - configMap:
+              name: cluster-profile-aws-centos-40
+      - configMap:
+          name: prow-job-cluster-scaleup-e2e-40
+        name: job-definition
+    trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$'
   - agent: kubernetes
     always_run: true
     branches:
@@ -500,68 +561,6 @@ presubmits:
           name: prow-job-cluster-launch-installer-openstack-e2e
         name: job-definition
     trigger: '(?m)^/test (?:.*? )?e2e-openstack(?: .*?)?$'
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - master
-    context: ci/prow/e2e-rhel-scaleup
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-    name: pull-ci-openshift-installer-master-e2e-rhel-scaleup
-    optional: true
-    rerun_command: /test e2e-rhel-scaleup
-    spec:
-      containers:
-      - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --give-pr-author-access-to-namespace=true
-        - --secret-dir=/usr/local/e2e-rhel-scaleup-cluster-profile
-        - --target=e2e-rhel-scaleup
-        - --template=/usr/local/e2e-rhel-scaleup
-        command:
-        - ci-operator
-        env:
-        - name: CLUSTER_TYPE
-          value: aws
-        - name: CONFIG_SPEC
-          valueFrom:
-            configMapKeyRef:
-              key: openshift-installer-master.yaml
-              name: ci-operator-master-configs
-        - name: JOB_NAME_SAFE
-          value: e2e-rhel-scaleup
-        - name: RPM_REPO_OPENSHIFT_ORIGIN
-          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/
-        - name: TEST_COMMAND
-          value: TEST_SUITE=openshift/conformance run-tests
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile
-          name: cluster-profile
-        - mountPath: /usr/local/e2e-rhel-scaleup
-          name: job-definition
-          subPath: cluster-scaleup-e2e-40.yaml
-      serviceAccountName: ci-operator
-      volumes:
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-aws
-          - configMap:
-              name: cluster-profile-aws-centos-40
-      - configMap:
-          name: prow-job-cluster-scaleup-e2e-40
-        name: job-definition
-    trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$'
   - agent: kubernetes
     always_run: false
     branches:

ci-operator/jobs/openshift/installer/openshift-installer-release-4.0-presubmits.yaml

@@ -61,22 +61,22 @@ presubmits:
     always_run: true
     branches:
     - release-4.0
-    context: ci/prow/e2e-rhel-scaleup
+    context: ci/prow/e2e-aws-scaleup-rhel7
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci-operator.openshift.io/prowgen-controlled: "true"
-    name: pull-ci-openshift-installer-release-4.0-e2e-rhel-scaleup
-    rerun_command: /test e2e-rhel-scaleup
+    name: pull-ci-openshift-installer-release-4.0-e2e-aws-scaleup-rhel7
+    rerun_command: /test e2e-aws-scaleup-rhel7
     spec:
       containers:
       - args:
         - --artifact-dir=$(ARTIFACTS)
         - --give-pr-author-access-to-namespace=true
-        - --secret-dir=/usr/local/e2e-rhel-scaleup-cluster-profile
-        - --target=e2e-rhel-scaleup
-        - --template=/usr/local/e2e-rhel-scaleup
+        - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile
+        - --target=e2e-aws-scaleup-rhel7
+        - --template=/usr/local/e2e-aws-scaleup-rhel7
         command:
         - ci-operator
         env:
@@ -88,7 +88,7 @@ presubmits:
               key: openshift-installer-release-4.0.yaml
               name: ci-operator-4.0-configs
         - name: JOB_NAME_SAFE
-          value: e2e-rhel-scaleup
+          value: e2e-aws-scaleup-rhel7
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/
         - name: TEST_COMMAND
@@ -100,9 +100,9 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile
+        - mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile
           name: cluster-profile
-        - mountPath: /usr/local/e2e-rhel-scaleup
+        - mountPath: /usr/local/e2e-aws-scaleup-rhel7
           name: job-definition
           subPath: cluster-scaleup-e2e-40.yaml
       serviceAccountName: ci-operator
@@ -117,7 +117,7 @@ presubmits:
       - configMap:
           name: prow-job-cluster-scaleup-e2e-40
         name: job-definition
-    trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$'
+    trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$'
   - agent: kubernetes
     always_run: true
     branches:

ci-operator/jobs/openshift/installer/openshift-installer-release-4.1-presubmits.yaml

@@ -61,22 +61,22 @@ presubmits:
     always_run: true
     branches:
     - release-4.1
-    context: ci/prow/e2e-rhel-scaleup
+    context: ci/prow/e2e-aws-scaleup-rhel7
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci-operator.openshift.io/prowgen-controlled: "true"
-    name: pull-ci-openshift-installer-release-4.1-e2e-rhel-scaleup
-    rerun_command: /test e2e-rhel-scaleup
+    name: pull-ci-openshift-installer-release-4.1-e2e-aws-scaleup-rhel7
+    rerun_command: /test e2e-aws-scaleup-rhel7
     spec:
       containers:
       - args:
         - --artifact-dir=$(ARTIFACTS)
         - --give-pr-author-access-to-namespace=true
-        - --secret-dir=/usr/local/e2e-rhel-scaleup-cluster-profile
-        - --target=e2e-rhel-scaleup
-        - --template=/usr/local/e2e-rhel-scaleup
+        - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile
+        - --target=e2e-aws-scaleup-rhel7
+        - --template=/usr/local/e2e-aws-scaleup-rhel7
         command:
         - ci-operator
         env:
@@ -88,7 +88,7 @@ presubmits:
               key: openshift-installer-release-4.1.yaml
               name: ci-operator-4.1-configs
         - name: JOB_NAME_SAFE
-          value: e2e-rhel-scaleup
+          value: e2e-aws-scaleup-rhel7
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/
         - name: TEST_COMMAND
@@ -100,9 +100,9 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile
+        - mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile
           name: cluster-profile
-        - mountPath: /usr/local/e2e-rhel-scaleup
+        - mountPath: /usr/local/e2e-aws-scaleup-rhel7
           name: job-definition
           subPath: cluster-scaleup-e2e-40.yaml
       serviceAccountName: ci-operator
@@ -117,7 +117,7 @@ presubmits:
       - configMap:
           name: prow-job-cluster-scaleup-e2e-40
         name: job-definition
-    trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$'
+    trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$'
   - agent: kubernetes
     always_run: true
     branches: