Skip to content

Commit 71956ef

Browse files
committed
Fix issues in Windows migration test
Fix issues for Windows CSI migration test
1 parent 9f9256b commit 71956ef

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

test/k8s-integration/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func main() {
140140
ensureVariable(storageClassFiles, true, "One of storageclass-file and migration-test must be set")
141141
}
142142

143-
if !*bringupCluster {
143+
if !*bringupCluster && *platform != "windows" {
144144
ensureVariable(kubeFeatureGates, false, "kube-feature-gates set but not bringing up new cluster")
145145
} else {
146146
ensureVariable(imageType, true, "image type is a required flag. Available options include 'cos' and 'ubuntu'")

test/run-k8s-windows-migration.sh

+12-10
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set -o nounset
1010
set -o errexit
1111

1212
export GCE_PD_VERBOSITY=9
13-
13+
E2E_GOOGLE_APPLICATION_CREDENTIALS=/usr/local/google/home/jinxu/Work/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/deploy/credentials/cloud-sa.json
1414
readonly PKGDIR=${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
1515

1616
readonly overlay_name="${GCE_PD_OVERLAY_NAME:-stable}"
@@ -19,21 +19,23 @@ readonly do_driver_build="${GCE_PD_DO_DRIVER_BUILD:-true}"
1919
readonly deployment_strategy=${DEPLOYMENT_STRATEGY:-gce}
2020
readonly kube_version=${GCE_PD_KUBE_VERSION:-master}
2121
readonly test_version=${TEST_VERSION:-master}
22+
readonly gce_zone=${GCE_CLUSTER_ZONE:-us-central1-b}
23+
readonly feature_gates="CSIMigration=true,CSIMigrationGCE=true,ExpandCSIVolumes=true"
2224

2325
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"
2426

2527
# TODO(#167): Enable reconstructions tests
2628

2729
make -C "${PKGDIR}" test-k8s-integration
2830

29-
base_cmd="${PKGDIR}/bin/k8s-integration-test \
31+
${PKGDIR}/bin/k8s-integration-test \
3032
--platform=windows --bringup-cluster=false --teardown-cluster=false \
31-
--run-in-prow=true
32-
--kube-feature-gates="CSIMigration=true,CSIMigrationGCE=true,ExpandCSIVolumes=true" --run-in-prow=true \
33-
--deploy-overlay-name="${overlay_name}" --service-account-file="${E2E_GOOGLE_APPLICATION_CREDENTIALS}" \
34-
--do-driver-build="${do_driver_build}" --boskos-resource-type="${boskos_resource_type}" \
35-
--migration-test=true --test-focus="${GCE_PD_TEST_FOCUS}" \
36-
--gce-zone="us-central1-b" --deployment-strategy="${deployment_strategy}" --test-version="${test_version}" "
37-
38-
eval "$base_cmd"
33+
--run-in-prow=true \
34+
--kube-feature-gates=${feature_gates} --run-in-prow=true \
35+
--deploy-overlay-name=${overlay_name} --service-account-file=${E2E_GOOGLE_APPLICATION_CREDENTIALS} \
36+
--do-driver-build=${do_driver_build} --boskos-resource-type=${boskos_resource_type} \
37+
--migration-test=true --test-focus=${GCE_PD_TEST_FOCUS} \
38+
--gce-zone=${gce_zone} --deployment-strategy=${deployment_strategy} --test-version=${test_version}
39+
40+
#eval "$base_cmd"
3941

0 commit comments

Comments
 (0)