WIP

Makefile

@@ -54,7 +54,7 @@ test-e2e-multi-az:
 
 .PHONY: test-e2e-migration
 test-e2e-migration:
-	AWS_REGION=us-west-2 AWS_AVAILABILITY_ZONES=us-west-2a GINKGO_FOCUS="\[ebs-csi-migration\]" ./hack/run-e2e-test
+	AWS_REGION=us-west-2 AWS_AVAILABILITY_ZONES=us-west-2a GINKGO_FOCUS="\[ebs-csi-migration\].+block.+volume-expand" ./hack/run-e2e-test
 
 .PHONY: image-release
 image-release:

hack/feature-gates.yaml

@@ -7,6 +7,7 @@
       CSIMigrationAWS: "true"
       ExpandCSIVolumes: "true"
       VolumeSnapshotDataSource: "true"
+      CSIInlineVolume: "true"
   kubeControllerManager:
     featureGates:
       CSIDriverRegistry: "true"
@@ -15,6 +16,7 @@
       CSIMigration: "true"
       CSIMigrationAWS: "true"
       ExpandCSIVolumes: "true"
+      CSIInlineVolume: "true"
   kubelet:
     featureGates:
       CSIDriverRegistry: "true"
@@ -23,3 +25,4 @@
       CSIMigration: "true"
       CSIMigrationAWS: "true"
       ExpandCSIVolumes: "true"
+      CSIInlineVolume: "true"

hack/run-e2e-test

@@ -17,15 +17,15 @@
 set -euo pipefail
 
 OS_ARCH=$(go env GOOS)-amd64
-TEST_ID=11027 # TODO $RANDOM
+TEST_ID=$RANDOM
 CLUSTER_NAME=test-cluster-$TEST_ID
 TEST_DIR=/tmp/ebs-e2e-test
 BASE_DIR=$(dirname $0)
 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-beta.0}
+K8S_VERSION=${K8S_VERSION-1.16.0-alpha.3}
 INSTANCE_TYPE=${INSTANCE_TYPE-c4.large}
 
 source $(dirname "${BASH_SOURCE}")/utils/helm.sh
@@ -99,31 +99,17 @@ helm install --name aws-ebs-csi-driver \
 
 # Run the test
 if [[ "$GINKGO_FOCUS" == "\[ebs-csi-migration\]" ]]; then
-    DEP_DOWNLOAD_URL=https://github.com/golang/dep/releases/download/v0.5.4/dep-$OS_ARCH
-    DEP_PATH=$TEST_DIR/dep
-
-    # Download dep if not yet
-    if [[ ! -e $DEP_PATH ]]; then
-      mkdir -p $TEST_DIR
-      echo "Downloading dep from $DEP_DOWNLOAD_URL to $DEP_PATH"
-      curl -L -X GET $DEP_DOWNLOAD_URL -o $DEP_PATH
-      chmod +x $DEP_PATH
-    fi
-
-    pushd ./tests/e2e-migration
-    $DEP_PATH ensure
-    popd
     # TODO known test failures to skip temporarily
     # - should not allow expansion of pvcs without AllowVolumeExpansion property
     #   - Test passes but cleanup fails, need https://github.com/kubernetes/kubernetes/pull/81107
     # - (block volmode) Verify if offline PVC expansion works / should resize volume when PVC is edited while pod is using it
     #   - NodeExpand for BlockVolumes not well-defined, need more investigation and possibly https://github.com/container-storage-interface/spec/issues/380
     # - should provision storage with mount options
     #   - Known bug, need https://github.com/kubernetes/kubernetes/pull/80191 but not yet in a patch release
-    GO111MODULE=off go test -v -timeout 0 ./tests/e2e-migration/... -kubeconfig=$HOME/.kube/config -report-dir=$ARTIFACTS -ginkgo.focus="$FOCUS" -ginkgo.skip="\[Disruptive\]\
+    go test -v -timeout 0 ./tests/e2e-migration/... -kubeconfig=$HOME/.kube/config -report-dir=$ARTIFACTS -ginkgo.focus="$FOCUS" -ginkgo.skip="\[Disruptive\]\
 |should.not.allow.expansion\
 |block.volmode.+volume-expand\
-|should.provision.storage.with.mount.options" -gce-zone=$REGION
+|should.provision.storage.with.mount.options" -gce-zone=${ZONES%,*}
 else
     go get -u github.com/onsi/ginkgo/ginkgo
     export KUBECONFIG=$HOME/.kube/config