Merge pull request #362 from leakingtapan/migration

Update to use 1.16 cluster with inline test enabled
kubernetes-sigs · Nov 7, 2019 · e5d1d7f · e5d1d7f
2 parents 1cb9a33 + 32abf5b
commit e5d1d7f
Show file tree

Hide file tree

Showing 6 changed files with 123 additions and 263 deletions.
diff --git a/hack/run-e2e-test b/hack/run-e2e-test
@@ -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
@@ -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 \
@@ -107,11 +110,14 @@ if [[ "$GINKGO_FOCUS" == "\[ebs-csi-migration\]" ]]; then
     # - should provision storage with mount options
     #   - Known bug, need https://github.com/kubernetes/kubernetes/pull/80191 but not yet in a patch release
     pushd ./tests/e2e-migration
-    go test -v -timeout 0 ./... -kubeconfig=$HOME/.kube/config -report-dir=$ARTIFACTS -ginkgo.focus="$FOCUS" -ginkgo.skip="\[Disruptive\]\
+    go get -u github.com/onsi/ginkgo/ginkgo
+    SKIP="\[Disruptive\]
 |should.not.allow.expansion\
 |block.volmode.+volume-expand\
 |should.provision.storage.with.mount.options\
-|should.not.mount./.map.unused.volumes.in.a.pod" -gce-zone=${ZONES%,*}
+|should.not.mount./.map.unused.volumes.in.a.pod"
+    ginkgo -p -nodes=$NODES -v --focus="$FOCUS" --skip="$SKIP" ./... -- -kubeconfig=$HOME/.kube/config -report-dir=$ARTIFACTS -gce-zone=${ZONES%,*}
+    #go test -v -timeout 0 ./... -kubeconfig=$HOME/.kube/config -report-dir=$ARTIFACTS -ginkgo.focus="$FOCUS" -ginkgo.skip="$SKIP" -gce-zone=${ZONES%,*}
     TEST_PASS=$?
     popd
 

diff --git a/hack/utils/helm.sh b/hack/utils/helm.sh
@@ -5,7 +5,7 @@ set -uo pipefail
 OS_ARCH=$(go env GOOS)-amd64
 
 helm::install() {
-    declare -r helm_name=helm-v2.14.1-$OS_ARCH.tar.gz
+    declare -r helm_name=helm-v2.16.0-$OS_ARCH.tar.gz
     wget https://get.helm.sh/$helm_name
     tar xvzf $helm_name
     mv $OS_ARCH/helm /usr/local/bin/helm
@@ -16,4 +16,4 @@ helm::init() {
     kubectl apply -f $rbac_file_path
     helm init --service-account tiller --history-max 200 --wait
     kubectl get po -n kube-system
-}
+}
diff --git a/tests/e2e-migration/e2e_test.go b/tests/e2e-migration/e2e_test.go
@@ -38,6 +38,7 @@ import (
 const kubeconfigEnvVar = "KUBECONFIG"
 
 func init() {
+	testing.Init()
 	// k8s.io/kubernetes/test/e2e/framework requires env KUBECONFIG to be set
 	// it does not fall back to defaults
 	if os.Getenv(kubeconfigEnvVar) == "" {

diff --git a/tests/e2e-migration/go.mod b/tests/e2e-migration/go.mod
@@ -2,56 +2,56 @@ module github.com/kubernetes-sigs/aws-ebs-csi-driver/tests/e2e-migration
 
 go 1.12
 
-replace k8s.io/api => k8s.io/api v0.0.0-20190822053644-6185379c914a
+replace k8s.io/api => k8s.io/api v0.0.0-20191003000013-35e20aa79eb8
 
-replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190822063004-0670dc4fec4e
+replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20191003002041-49e3d608220c
 
-replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190820074809-31b1e1ea64dc
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
 
-replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190822060508-785eacbd19ae
+replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20191003001037-3c8b233e046c
 
-replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190822063658-442a64f3fed7
+replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191003002408-6e42c232ac7d
 
-replace k8s.io/client-go => k8s.io/client-go v0.0.0-20190822054823-0a74433fb222
+replace k8s.io/client-go => k8s.io/client-go v0.0.0-20191003000419-f68efa97b39e
 
-replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190822065847-2058b41dfbb6
+replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20191003003426-b4b1f434fead
 
-replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190822065536-566e5fc137f7
+replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20191003003255-c493acd9e2ff
 
-replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190820100630-060a3d12ce80
+replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190927045949-f81bca4f5e85
 
-replace k8s.io/component-base => k8s.io/component-base v0.0.0-20190822055535-1f6a258f5d89
+replace k8s.io/component-base => k8s.io/component-base v0.0.0-20191003000551-f573d376509c
 
-replace k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190820110325-95eec93e2395
+replace k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac
 
-replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190822070154-f51cd605b3ee
+replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20191003003551-0eecdcdcc049
 
-replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190822061015-a4f93a8219ed
+replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20191003001317-a019a9d85a86
 
-replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190822065235-826221481525
+replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20191003003129-09316795c0dd
 
-replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190822064323-7e0495d8a3ff
+replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20191003002707-f6b7b0f55cc0
 
-replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190822064931-4470440ed041
+replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20191003003001-314f0beee0a9
 
-replace k8s.io/kubectl => k8s.io/kubectl v0.0.0-20190822071625-14af4a63a1e1
+replace k8s.io/kubectl => k8s.io/kubectl v0.0.0-20191003004222-1f3c0cd90ca9
 
-replace k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190822064626-fa8f3d935631
+replace k8s.io/kubelet => k8s.io/kubelet v0.0.0-20191003002833-e367e4712542
 
-replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190822070624-3a30a18bba71
+replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20191003003732-7d49cdad1c12
 
-replace k8s.io/metrics => k8s.io/metrics v0.0.0-20190822063337-6c03eb8600ee
+replace k8s.io/metrics => k8s.io/metrics v0.0.0-20191003002233-837aead57baf
 
-replace k8s.io/node-api => k8s.io/node-api v0.0.0-20190822070940-24e163ffb9e7
+replace k8s.io/node-api => k8s.io/node-api v0.0.0-20191003003902-772c6d2244f3
 
-replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190822061642-ab22eab63834
+replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20191003001538-80f33ca02582
 
-replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20190822064016-bcca3cc588da
+replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20191003002540-40951731b79f
 
-replace k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20190822062306-1b561d990eb5
+replace k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20191003001734-27680fba8268
 
 require (
 	github.com/onsi/ginkgo v1.9.0
 	github.com/onsi/gomega v1.6.0
-	k8s.io/kubernetes v1.16.0-beta.1
+	k8s.io/kubernetes v1.16.1
 )