Merge pull request #4098 from abhinavdahiya/fix_azure_e2e

templates/openshift/installer: run Azure specific e2e tests

Author: openshift-merge-robot

ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml

@@ -159,12 +159,8 @@ objects:
           # TODO: make openshift-tests auto-discover this from cluster config
           export TEST_PROVIDER='{"type":"aws","region":"us-east-1","zone":"us-east-1a","multizone":true,"multimaster":true}'
           export KUBE_SSH_USER=core
-        elif [[ "${CLUSTER_TYPE}" == "azure" ]]; then
-          mkdir -p ~/.ssh
-          export PROVIDER_ARGS="-provider=azure -gce-zone=centralus"
-          # TODO: make openshift-tests auto-discover this from cluster config
-          export TEST_PROVIDER='{"type":"azure","region":"centralus","multizone":true,"multimaster":true}'
-          export KUBE_SSH_USER=core
+        elif [[ "${CLUSTER_TYPE}" == "azure4" ]]; then
+          export TEST_PROVIDER='azure'
         fi
 
         mkdir -p /tmp/output

ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml

@@ -159,12 +159,8 @@ objects:
           # TODO: make openshift-tests auto-discover this from cluster config
           export TEST_PROVIDER='{"type":"aws","region":"us-east-1","zone":"us-east-1a","multizone":true,"multimaster":true}'
           export KUBE_SSH_USER=core
-        elif [[ "${CLUSTER_TYPE}" == "azure" ]]; then
-          mkdir -p ~/.ssh
-          export PROVIDER_ARGS="-provider=azure -gce-zone=centralus"
-          # TODO: make openshift-tests auto-discover this from cluster config
-          export TEST_PROVIDER='{"type":"azure","region":"centralus","multizone":true,"multimaster":true}'
-          export KUBE_SSH_USER=core
+        elif [[ "${CLUSTER_TYPE}" == "azure4" ]]; then
+          export TEST_PROVIDER='azure'
         elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then
           mkdir -p ~/.ssh
           cp /tmp/cluster/ssh-privatekey ~/.ssh/kube_openstack_rsa || true