From 58bb4d3747db5db1a3f110cbf09719a25de4dd20 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Sun, 11 Aug 2019 13:35:05 -0700 Subject: [PATCH] Running multi-az e2e test using Nitro instance --- Makefile | 2 +- hack/run-e2e-test | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1abb1966b4..5d0ae17cc5 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ test-e2e-single-az: .PHONY: test-e2e-multi-az test-e2e-multi-az: - AWS_REGION=us-west-2 AWS_AVAILABILITY_ZONES=us-west-2a,us-west-2b,us-west-2c GINKGO_FOCUS="\[ebs-csi-e2e\] \[multi-az\]" ./hack/run-e2e-test + AWS_REGION=us-west-2 AWS_AVAILABILITY_ZONES=us-west-2a,us-west-2b,us-west-2c INSTANCE_TYPE=c5.large GINKGO_FOCUS="\[ebs-csi-e2e\] \[multi-az\]" ./hack/run-e2e-test .PHONY: image-release image-release: diff --git a/hack/run-e2e-test b/hack/run-e2e-test index 66c7e5de19..7425ea1a35 100755 --- a/hack/run-e2e-test +++ b/hack/run-e2e-test @@ -26,6 +26,7 @@ ZONES=${AWS_AVAILABILITY_ZONES-us-east-1a,us-east-1b,us-east-1c} FOCUS=${GINKGO_FOCUS-"[ebs-csi-e2e]"} NODES=${GINKGO_NODES:-32} K8S_VERSION=${K8S_VERSION-1.14.0} +INSTANCE_TYPE=${INSTANCE_TYPE-c4.large} source $(dirname "${BASH_SOURCE}")/utils/helm.sh @@ -54,6 +55,7 @@ ssh-keygen -P csi-e2e -f $SSH_KEY_PATH $KOPS_PATH create cluster --state $KOPS_STATE_FILE \ --zones $ZONES \ --node-count=3 \ + --node-size=$INSTANCE_TYPE \ --kubernetes-version=$K8S_VERSION \ --ssh-public-key=$SSH_KEY_PATH.pub \ $CLUSTER_NAME.k8s.local