File tree Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -231,8 +231,11 @@ configvar CSI_PROW_E2E_VERSION "$(version_to_git "${CSI_PROW_KUBERNETES_VERSION}
231
231
configvar CSI_PROW_E2E_REPO " https://github.com/kubernetes/kubernetes" " E2E repo"
232
232
configvar CSI_PROW_E2E_IMPORT_PATH " k8s.io/kubernetes" " E2E package"
233
233
234
- # Local path for e2e tests. Set to "none" to disable.
235
- configvar CSI_PROW_SIDECAR_E2E_IMPORT_PATH " none" " CSI Sidecar E2E package"
234
+ # Local path & package path for e2e tests. Set to "none" to disable.
235
+ # When using versioned go modules, the import path is the module path whereas the path
236
+ # should not contain the version and be the directory where the module is checked out.
237
+ configvar CSI_PROW_SIDECAR_E2E_IMPORT_PATH " none" " CSI Sidecar E2E package (go import path)"
238
+ configvar CSI_PROW_SIDECAR_E2E_PATH " ${CSI_PROW_SIDECAR_E2E_IMPORT_PATH} " " CSI Sidecar E2E path (directory)"
236
239
237
240
# csi-sanity testing from the csi-test repo can be run against the installed
238
241
# CSI driver. For this to work, deploying the driver must expose the Unix domain
@@ -1035,7 +1038,7 @@ run_e2e () (
1035
1038
trap move_junit EXIT
1036
1039
1037
1040
if [ " ${name} " == " local" ]; then
1038
- cd " ${GOPATH} /src/${CSI_PROW_SIDECAR_E2E_IMPORT_PATH } " &&
1041
+ cd " ${GOPATH} /src/${CSI_PROW_SIDECAR_E2E_PATH } " &&
1039
1042
run_with_loggers env KUBECONFIG=" $KUBECONFIG " KUBE_TEST_REPO_LIST=" $( if [ -e " ${CSI_PROW_WORK} /e2e-repo-list" ]; then echo " ${CSI_PROW_WORK} /e2e-repo-list" ; fi) " ginkgo --timeout=" ${CSI_PROW_GINKGO_TIMEOUT} " -v " $@ " " ${CSI_PROW_WORK} /e2e-local.test" -- -report-dir " ${ARTIFACTS} " -report-prefix local
1040
1043
else
1041
1044
cd " ${GOPATH} /src/${CSI_PROW_E2E_IMPORT_PATH} " &&
You can’t perform that action at this time.
0 commit comments