From 78243d7e48387f85acf444516eebd1db91f3827b Mon Sep 17 00:00:00 2001
From: Cheng Pan <chengpan@amazon.com>
Date: Mon, 7 Oct 2019 09:55:06 -0700
Subject: [PATCH] Use dev build of kops

---
 hack/run-e2e-test          | 9 ++++++---
 tests/e2e-migration/go.mod | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/hack/run-e2e-test b/hack/run-e2e-test
index f43f87bd58..b4fd50d446 100755
--- a/hack/run-e2e-test
+++ b/hack/run-e2e-test
@@ -32,15 +32,17 @@ source $(dirname "${BASH_SOURCE}")/utils/helm.sh
 
 echo "Testing in region: $REGION and zones: $ZONES"
 
-KOPS_DOWNLOAD_URL=https://github.com/kubernetes/kops/releases/download/1.14.0-alpha.1/kops-$OS_ARCH
+#KOPS_DOWNLOAD_URL=https://github.com/kubernetes/kops/releases/download/1.14.0-alpha.1/kops-$OS_ARCH
 KOPS_PATH=$TEST_DIR/kops
 KOPS_STATE_FILE=s3://k8s-kops-csi-e2e
 
 # Download kops if not yet
 if [[ ! -e $KOPS_PATH ]]; then
     mkdir -p $TEST_DIR
-    echo "Downloading KOPS from $KOPS_DOWNLOAD_URL to $KOPS_PATH"
-    curl -L -X GET $KOPS_DOWNLOAD_URL -o $KOPS_PATH
+    #echo "Downloading KOPS from $KOPS_DOWNLOAD_URL to $KOPS_PATH"
+    #curl -L -X GET $KOPS_DOWNLOAD_URL -o $KOPS_PATH
+    echo "Downloading KOPS from s3 to $KOPS_PATH"
+    aws s3 cp s3://${KOPS_STATE_FILE}/kops/bin/kops $KOPS_PATH
 fi
 
 chmod +x $KOPS_PATH
@@ -61,6 +63,7 @@ CLUSTER_YAML_PATH=$TEST_DIR/$CLUSTER_NAME.yaml
 SSH_KEY_PATH=$TEST_DIR/id_rsa
 ssh-keygen -P csi-e2e -f $SSH_KEY_PATH
 
+export KOPS_BASE_URL=https://${KOPS_STATE_FILE}.s3.amazonaws.com/kops/1.16.0-alpha.1/
 $KOPS_PATH create cluster --state $KOPS_STATE_FILE \
     --zones $ZONES \
     --node-count=3 \
diff --git a/tests/e2e-migration/go.mod b/tests/e2e-migration/go.mod
index f8cc228b8d..deaa4d1d5f 100644
--- a/tests/e2e-migration/go.mod
+++ b/tests/e2e-migration/go.mod
@@ -53,5 +53,5 @@ replace k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-201909042007
 require (
 	github.com/onsi/ginkgo v1.9.0
 	github.com/onsi/gomega v1.6.0
-	k8s.io/kubernetes v1.16.0-beta.2
+	k8s.io/kubernetes v1.16.1
 )