From cf0e0888444c9b5a20e380af85250aa7a9d7a095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Th=C3=B6mmes?= <markusthoemmes@me.com>
Date: Mon, 14 Oct 2019 16:26:34 +0200
Subject: [PATCH 1/3] Update UPI E2E template to contain improvements from the
 SRC template.

---
 .../cluster-launch-installer-upi-e2e.yaml     | 31 ++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
index 1c9617a2ebbb8..9bc47a8c8ac4e 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
@@ -230,14 +230,16 @@ objects:
       - name: artifacts
         mountPath: /tmp/artifacts
       env:
-      - name: AWS_SHARED_CREDENTIALS_FILE
-        value: /tmp/cluster/.awscred
       - name: AWS_REGION
         value: us-east-1
-      - name: ARTIFACT_DIR
-        value: /tmp/artifacts
+      - name: AWS_SHARED_CREDENTIALS_FILE
+        value: /tmp/cluster/.awscred
+      - name: AZURE_AUTH_LOCATION
+        value: /tmp/cluster/osServicePrincipal.json
       - name: GCP_SHARED_CREDENTIALS_FILE
         value: /tmp/cluster/gce.json
+      - name: ARTIFACT_DIR
+        value: /tmp/artifacts
       - name: HOME
         value: /tmp/home
       - name: KUBECONFIG
@@ -278,6 +280,18 @@ objects:
           oc create -f /tmp/cluster/insights-live.yaml || true
         fi
 
+        function setup-google-cloud-sdk() {
+          pushd /tmp
+          curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-256.0.0-linux-x86_64.tar.gz
+          tar -xzf google-cloud-sdk-256.0.0-linux-x86_64.tar.gz
+          export PATH=$PATH:/tmp/google-cloud-sdk/bin
+          mkdir gcloudconfig
+          export CLOUDSDK_CONFIG=/tmp/gcloudconfig
+          gcloud auth activate-service-account --key-file="${GCP_SHARED_CREDENTIALS_FILE}"
+          gcloud config set project openshift-gce-devel-ci
+          popd
+        }
+
         # 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
@@ -294,6 +308,15 @@ 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}" == "azure4" ]]; then
+          export TEST_PROVIDER='azure'
+        elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then
+          mkdir -p ~/.ssh
+          cp /tmp/cluster/ssh-privatekey ~/.ssh/kube_openstack_rsa || true
+        fi
+
+        if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
+          setup-google-cloud-sdk
         fi
 
         mkdir -p /tmp/output

From 64e72af5f813b43d5b87f4f19dee9452cd7854f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Th=C3=B6mmes?= <markusthoemmes@me.com>
Date: Mon, 14 Oct 2019 16:28:08 +0200
Subject: [PATCH 2/3] Update API version for setup steps.

---
 .../openshift/installer/cluster-launch-installer-upi-e2e.yaml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
index 9bc47a8c8ac4e..0da3386c52599 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
@@ -529,7 +529,7 @@ objects:
         }
         EOF
             cat > /tmp/artifacts/installer/install-config.yaml << EOF
-        apiVersion: v1beta4
+        apiVersion: v1
         baseDomain: ${base_domain}
         metadata:
           name: ${CLUSTER_NAME}

From 639f3edfedec1fb9ee176bda844bcefd0cb5a021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Th=C3=B6mmes?= <markusthoemmes@me.com>
Date: Mon, 14 Oct 2019 16:58:42 +0200
Subject: [PATCH 3/3] Add IMAGE_FORMAT parameter.

See https://github.com/openshift/ci-tools/blob/master/TEMPLATES.md#image_format for more documentation.
---
 .../openshift/installer/cluster-launch-installer-upi-e2e.yaml  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
index 0da3386c52599..30bd029411ce0 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
@@ -8,6 +8,7 @@ parameters:
   required: true
 - name: NAMESPACE
   required: true
+- name: IMAGE_FORMAT
 - name: IMAGE_TESTS
   required: true
 - name: IMAGE_UPI_INSTALLER
@@ -242,6 +243,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: