Enable migration tests to run on GKE clusters.

Author: TeweiLuo

test/k8s-integration/main.go

@@ -157,7 +157,6 @@ func main() {
 	}
 
 	if *deploymentStrat == "gke" {
-		ensureFlag(migrationTest, false, "Cannot set deployment strategy to 'gke' for migration tests.")
 		ensureVariable(kubeVersion, false, "Cannot set kube-version when using deployment strategy 'gke'. Use gke-cluster-version.")
 		ensureExactlyOneVariableSet([]*string{gkeClusterVer, gkeReleaseChannel},
 			"For GKE cluster deployment, exactly one of 'gke-cluster-version' or 'gke-release-channel' must be set")

test/run-k8s-integration-ci.sh

@@ -27,6 +27,9 @@ readonly gke_node_version=${GKE_NODE_VERSION:-}
 readonly run_intree_plugin_tests=${RUN_INTREE_PLUGIN_TESTS:-false}
 readonly use_kubetest2=${USE_KUBETEST2:-true}
 readonly test_pd_labels=${TEST_PD_LABELS:-true}
+readonly migration_test=${MIGRATION_TEST:-false}
+
+readonly GCE_PD_TEST_FOCUS="PersistentVolumes\sGCEPD|[V|v]olume\sexpand|\[sig-storage\]\sIn-tree\sVolumes\s\[Driver:\sgcepd\]|allowedTopologies|Pod\sDisks|PersistentVolumes\sDefault"
 
 storage_classes=sc-balanced.yaml,sc-ssd.yaml
 
@@ -59,7 +62,9 @@ base_cmd="${PKGDIR}/bin/k8s-integration-test \
             --deployment-strategy=${deployment_strategy} --test-version=${test_version} \
             --num-nodes=3 --image-type=${image_type} --use-kubetest2=${use_kubetest2}"
 
-if [ "$run_intree_plugin_tests" = true ]; then
+if [ "$migration_test" = true ]; then
+  base_cmd="${base_cmd} --migration-test=true --test-focus=${GCE_PD_TEST_FOCUS}"
+elif [ "$run_intree_plugin_tests" = true ]; then
   base_cmd="${base_cmd} --test-focus='External.Storage|In-tree.*Driver.*gcepd'"
 else
   base_cmd="${base_cmd} --test-focus='External.Storage'"

test/run-k8s-integration.sh

@@ -25,9 +25,12 @@ readonly gke_release_channel=${GKE_RELEASE_CHANNEL:-""}
 readonly teardown_driver=${GCE_PD_TEARDOWN_DRIVER:-true}
 readonly gke_node_version=${GKE_NODE_VERSION:-}
 readonly use_kubetest2=${USE_KUBETEST2:-true}
+readonly migration_test=${MIGRATION_TEST:-false}
 
 export GCE_PD_VERBOSITY=9
 
+readonly GCE_PD_TEST_FOCUS="PersistentVolumes\sGCEPD|[V|v]olume\sexpand|\[sig-storage\]\sIn-tree\sVolumes\s\[Driver:\sgcepd\]|allowedTopologies|Pod\sDisks|PersistentVolumes\sDefault"
+
 make -C "${PKGDIR}" test-k8s-integration
 
 if [ "$use_kubetest2" = true ]; then
@@ -42,7 +45,7 @@ base_cmd="${PKGDIR}/bin/k8s-integration-test \
             --run-in-prow=true --service-account-file=${E2E_GOOGLE_APPLICATION_CREDENTIALS} \
             --do-driver-build=${do_driver_build} --teardown-driver=${teardown_driver} --boskos-resource-type=${boskos_resource_type} \
             --storageclass-files=sc-standard.yaml --snapshotclass-file=pd-volumesnapshotclass.yaml \
-            --test-focus='External.Storage' --deployment-strategy=${deployment_strategy} --test-version=${test_version} \
+            --deployment-strategy=${deployment_strategy} --test-version=${test_version} \
             --num-nodes=3 --image-type=${image_type} --use-kubetest2=${use_kubetest2}"
 
 if [ "$use_gke_managed_driver" = false ]; then
@@ -70,4 +73,11 @@ fi
 if [ -z "$gke_node_version" ]; then
   base_cmd="${base_cmd} --gke-node-version=${gke_node_version}"
 fi
+
+if [ "$migration_test" = "true" ]; then
+  base_cmd="${base_cmd} --migration-test=true --test-focus=${GCE_PD_TEST_FOCUS}"
+else
+  base_cmd="${base_cmd} --test-focus='External.Storage'"
+fi
+
 eval "$base_cmd"