Merge pull request #711 from jingxu97/feb/migration

Fix issues in Windows migration test

Author: k8s-ci-robot

test/k8s-integration/main.go

@@ -140,7 +140,7 @@ func main() {
 		ensureVariable(storageClassFiles, true, "One of storageclass-file and migration-test must be set")
 	}
 
-	if !*bringupCluster {
+	if !*bringupCluster && *platform != "windows" {
 		ensureVariable(kubeFeatureGates, false, "kube-feature-gates set but not bringing up new cluster")
 	} else {
 		ensureVariable(imageType, true, "image type is a required flag. Available options include 'cos' and 'ubuntu'")

test/run-k8s-windows-migration.sh

@@ -10,7 +10,6 @@ set -o nounset
 set -o errexit
 
 export GCE_PD_VERBOSITY=9
-
 readonly PKGDIR=${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
 
 readonly overlay_name="${GCE_PD_OVERLAY_NAME:-stable}"
@@ -19,21 +18,23 @@ readonly do_driver_build="${GCE_PD_DO_DRIVER_BUILD:-true}"
 readonly deployment_strategy=${DEPLOYMENT_STRATEGY:-gce}
 readonly kube_version=${GCE_PD_KUBE_VERSION:-master}
 readonly test_version=${TEST_VERSION:-master}
+readonly gce_zone=${GCE_CLUSTER_ZONE:-us-central1-b}
+readonly feature_gates="CSIMigration=true,CSIMigrationGCE=true,ExpandCSIVolumes=true"
 
 readonly GCE_PD_TEST_FOCUS="PersistentVolumes\sGCEPD|[V|v]olume\sexpand|\[sig-storage\]\sIn-tree\sVolumes\s\[Driver:\swindows-gcepd\]|allowedTopologies|Pod\sDisks|PersistentVolumes\sDefault"
 
 # TODO(#167): Enable reconstructions tests
 
 make -C "${PKGDIR}" test-k8s-integration
 
-base_cmd="${PKGDIR}/bin/k8s-integration-test \
+${PKGDIR}/bin/k8s-integration-test \
         --platform=windows --bringup-cluster=false  --teardown-cluster=false \
-        --run-in-prow=true
-        --kube-feature-gates="CSIMigration=true,CSIMigrationGCE=true,ExpandCSIVolumes=true" --run-in-prow=true \
-        --deploy-overlay-name="${overlay_name}" --service-account-file="${E2E_GOOGLE_APPLICATION_CREDENTIALS}" \
-        --do-driver-build="${do_driver_build}" --boskos-resource-type="${boskos_resource_type}" \
-        --migration-test=true --test-focus="${GCE_PD_TEST_FOCUS}" \
-        --gce-zone="us-central1-b" --deployment-strategy="${deployment_strategy}" --test-version="${test_version}" "
-
-eval "$base_cmd"
+        --run-in-prow=true \
+        --kube-feature-gates=${feature_gates} --run-in-prow=true \
+        --deploy-overlay-name=${overlay_name} --service-account-file=${E2E_GOOGLE_APPLICATION_CREDENTIALS} \
+        --do-driver-build=${do_driver_build} --boskos-resource-type=${boskos_resource_type} \
+        --migration-test=true --test-focus=${GCE_PD_TEST_FOCUS} \
+        --gce-zone=${gce_zone} --deployment-strategy=${deployment_strategy} --test-version=${test_version}
+
+#eval "$base_cmd"