Skip to content

Commit f997312

Browse files
authored
Merge pull request #904 from mauriciopoppe/use-compiled-binaries
Use double quotes to expand variables in the windows migration e2e script
2 parents 848328b + b1e406b commit f997312

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

test/run-windows-k8s-integration.sh

+11-11
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,21 @@ fi
3636

3737
${PKGDIR}/bin/k8s-integration-test \
3838
--run-in-prow=true \
39-
--service-account-file=${E2E_GOOGLE_APPLICATION_CREDENTIALS} \
40-
--boskos-resource-type=${boskos_resource_type} \
41-
--deployment-strategy=${deployment_strategy} \
42-
--gce-zone=${gce_zone} \
39+
--service-account-file="${E2E_GOOGLE_APPLICATION_CREDENTIALS}" \
40+
--boskos-resource-type="${boskos_resource_type}" \
41+
--deployment-strategy="${deployment_strategy}" \
42+
--gce-zone="${gce_zone}" \
4343
--platform=windows \
4444
--bringup-cluster=true \
4545
--teardown-cluster=true \
4646
--num-nodes=1 \
47-
--num-windows-nodes=${num_windows_nodes} \
48-
--teardown-driver=${teardown_driver} \
49-
--do-driver-build=${do_driver_build} \
50-
--deploy-overlay-name=${overlay_name} \
51-
--test-version=${test_version} \
52-
--kube-version=${kube_version} \
47+
--num-windows-nodes="${num_windows_nodes}" \
48+
--teardown-driver="${teardown_driver}" \
49+
--do-driver-build="${do_driver_build}" \
50+
--deploy-overlay-name="${overlay_name}" \
51+
--test-version="${test_version}" \
52+
--kube-version="${kube_version}" \
5353
--storageclass-files=sc-windows.yaml \
5454
--snapshotclass-file=pd-volumesnapshotclass.yaml \
5555
--test-focus='External.Storage' \
56-
--use-kubetest2=${use_kubetest2}
56+
--use-kubetest2="${use_kubetest2}"

test/run-windows-k8s-migration.sh

+13-13
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,22 @@ readonly GCE_PD_TEST_FOCUS="PersistentVolumes\sGCEPD|[V|v]olume\sexpand|\[sig-st
4343

4444
${PKGDIR}/bin/k8s-integration-test \
4545
--run-in-prow=true \
46-
--service-account-file=${E2E_GOOGLE_APPLICATION_CREDENTIALS} \
47-
--boskos-resource-type=${boskos_resource_type} \
48-
--deployment-strategy=${deployment_strategy} \
49-
--gce-zone=${gce_zone} \
46+
--service-account-file="${E2E_GOOGLE_APPLICATION_CREDENTIALS}" \
47+
--boskos-resource-type="${boskos_resource_type}" \
48+
--deployment-strategy="${deployment_strategy}" \
49+
--gce-zone="${gce_zone}" \
5050
--platform=windows \
5151
--bringup-cluster=true \
5252
--teardown-cluster=true \
5353
--num-nodes=1 \
54-
--num-windows-nodes=${num_windows_nodes} \
55-
--teardown-driver=${teardown_driver} \
56-
--do-driver-build=${do_driver_build} \
57-
--deploy-overlay-name=${overlay_name} \
58-
--test-version=${test_version} \
59-
--kube-version=${kube_version} \
60-
--kube-feature-gates=${feature_gates} \
54+
--num-windows-nodes="${num_windows_nodes}" \
55+
--teardown-driver="${teardown_driver}" \
56+
--do-driver-build="${do_driver_build}" \
57+
--deploy-overlay-name="${overlay_name}" \
58+
--test-version="${test_version}" \
59+
--kube-version="${kube_version}" \
60+
--kube-feature-gates="${feature_gates}" \
6161
--storageclass-files=sc-windows.yaml \
6262
--snapshotclass-file=pd-volumesnapshotclass.yaml \
63-
--test-focus=${GCE_PD_TEST_FOCUS} \
64-
--use-kubetest2=${use_kubetest2}
63+
--test-focus="${GCE_PD_TEST_FOCUS}" \
64+
--use-kubetest2="${use_kubetest2}"

0 commit comments

Comments
 (0)