Skip to content

Commit

Permalink
Use dev build of kops
Browse files Browse the repository at this point in the history
  • Loading branch information
Cheng Pan committed Nov 6, 2019
1 parent 544e048 commit f3d7d50
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
11 changes: 7 additions & 4 deletions hack/run-e2e-test
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,24 @@ REGION=${AWS_REGION-us-west-2}
ZONES=${AWS_AVAILABILITY_ZONES-us-west-2a,us-west-2b,us-west-2c}
FOCUS=${GINKGO_FOCUS-"[ebs-csi-e2e]"}
NODES=${GINKGO_NODES:-32}
K8S_VERSION=${K8S_VERSION-1.15.3}
K8S_VERSION=${K8S_VERSION-1.16.1}
INSTANCE_TYPE=${INSTANCE_TYPE-c4.large}

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 ${KOPS_STATE_FILE}/kops/bin/kops $KOPS_PATH
fi

chmod +x $KOPS_PATH
Expand All @@ -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://k8s-kops-csi-e2e.s3.amazonaws.com/kops/1.16.0-alpha.1/
$KOPS_PATH create cluster --state $KOPS_STATE_FILE \
--zones $ZONES \
--node-count=3 \
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-migration/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@ replace k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-201910030017
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
)

0 comments on commit f3d7d50

Please sign in to comment.