Update RHEL7 scaleup template and tests

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

@@ -72,6 +72,6 @@ tests:
   container:
     from: test-bin
 - as: e2e-aws-scaleup-rhel7
-  commands: TEST_SUITE=openshift/conformance run-tests
+  commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_ansible_40:
     cluster_profile: aws-centos-40

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

@@ -72,6 +72,6 @@ tests:
   container:
     from: test-bin
 - as: e2e-aws-scaleup-rhel7
-  commands: TEST_SUITE=openshift/conformance run-tests
+  commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_ansible_40:
     cluster_profile: aws-centos-40

ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-4.2.yaml

@@ -73,6 +73,6 @@ tests:
   container:
     from: test-bin
 - as: e2e-aws-scaleup-rhel7
-  commands: TEST_SUITE=openshift/conformance run-tests
+  commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_ansible_40:
     cluster_profile: aws-centos-40

ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-4.3.yaml

@@ -72,6 +72,6 @@ tests:
   container:
     from: test-bin
 - as: e2e-aws-scaleup-rhel7
-  commands: TEST_SUITE=openshift/conformance run-tests
+  commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_ansible_40:
     cluster_profile: aws-centos-40

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

@@ -38,7 +38,7 @@ presubmits:
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/
         - name: TEST_COMMAND
-          value: TEST_SUITE=openshift/conformance run-tests
+          value: TEST_SUITE=openshift/conformance/parallel run-tests
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""

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

@@ -38,7 +38,7 @@ presubmits:
         - 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
+          value: TEST_SUITE=openshift/conformance/parallel run-tests
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""

ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-4.2-presubmits.yaml

@@ -38,7 +38,7 @@ presubmits:
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/
         - name: TEST_COMMAND
-          value: TEST_SUITE=openshift/conformance run-tests
+          value: TEST_SUITE=openshift/conformance/parallel run-tests
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""

ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-4.3-presubmits.yaml

@@ -38,7 +38,7 @@ presubmits:
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.3/
         - name: TEST_COMMAND
-          value: TEST_SUITE=openshift/conformance run-tests
+          value: TEST_SUITE=openshift/conformance/parallel run-tests
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""

ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml

@@ -68,6 +68,7 @@ objects:
       # we want to gather the teardown logs no matter what
       ci-operator.openshift.io/wait-for-container-artifacts: teardown
       ci-operator.openshift.io/save-container-logs: "true"
+      ci-operator.openshift.io/container-sub-tests: "setup,scaleup,test,teardown"
   spec:
     restartPolicy: Never
     activeDeadlineSeconds: 14400
@@ -107,6 +108,8 @@ objects:
         value: /tmp/artifacts
       - name: HOME
         value: /tmp/home
+      - name: IMAGE_FORMAT
+        value: ${IMAGE_FORMAT}
       - name: KUBECONFIG
         value: /tmp/artifacts/installer/auth/kubeconfig
       command:
@@ -120,11 +123,10 @@ objects:
 
         trap 'touch /tmp/shared/exit' EXIT
         trap 'kill $(jobs -p); exit 0' TERM
-        
+
         mkdir -p "${HOME}"
 
-        echo -n "Waiting for scaleup to complete..."
-
+        # wait for the API to come up
         while true; do
           if [[ -f /tmp/shared/exit ]]; then
             echo "Another process exited" 2>&1
@@ -140,8 +142,12 @@ objects:
           break
         done
 
-        echo "completed!"
-
+        # if the cluster profile included an insights secret, install it to the cluster to
+        # report support data from the support-operator
+        if [[ -f /tmp/cluster/insights-live.yaml ]]; then
+          oc create -f /tmp/cluster/insights-live.yaml || true
+        fi
+
         # set up cloud-provider-specific env vars
         export KUBE_SSH_BASTION="$( oc --insecure-skip-tls-verify get node -l node-role.kubernetes.io/master -o 'jsonpath={.items[0].status.addresses[?(@.type=="ExternalIP")].address}' ):22"
         export KUBE_SSH_KEY_PATH=/tmp/cluster/ssh-privatekey
@@ -164,7 +170,7 @@ objects:
         mkdir -p /tmp/output
         cd /tmp/output
 
-         function run-tests() {
+        function run-tests() {
           openshift-tests run "${TEST_SUITE}" \
             --provider "${TEST_PROVIDER:-}" -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit
           exit 0
@@ -194,6 +200,8 @@ objects:
         value: ${NAMESPACE}-${JOB_NAME_HASH}
       - name: BASE_DOMAIN
         value: ${BASE_DOMAIN}
+      - name: SSH_PRIV_KEY_PATH
+        value: /etc/openshift-installer/ssh-privatekey
       - name: SSH_PUB_KEY_PATH
         value: /etc/openshift-installer/ssh-publickey
       - name: PULL_SECRET_PATH
@@ -228,10 +236,14 @@ objects:
         export SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}")
         export PULL_SECRET=$(cat "${PULL_SECRET_PATH}")
 
+        ## move private key to ~/.ssh/ so that installer can use it to gather logs on bootstrap failure
+        mkdir -p ~/.ssh
+        cp "${SSH_PRIV_KEY_PATH}" ~/.ssh/
+
         if [[ "${CLUSTER_TYPE}" == "aws" ]]; then
             cat > /tmp/artifacts/installer/install-config.yaml << EOF
-        apiVersion: v1beta4
-        baseDomain: ${BASE_DOMAIN}
+        apiVersion: v1
+        baseDomain: ${BASE_DOMAIN:-origin-ci-int-aws.dev.rhcloud.com}
         metadata:
           name: ${CLUSTER_NAME}
         controlPlane: