@@ -325,7 +325,7 @@ configvar CSI_PROW_E2E_MOCK "$(if [ "${CSI_PROW_DRIVER_CANARY}" = "canary" ] &&
325
325
326
326
# Regex for non-alpha, feature-tagged tests that should be run.
327
327
#
328
- configvar CSI_PROW_E2E_FOCUS_LATEST ' \[Feature:VolumeSnapshotDataSource\]|\[Feature: volumegroupsnapshot\]' " non-alpha, feature-tagged tests for latest Kubernetes version"
328
+ configvar CSI_PROW_E2E_FOCUS_LATEST ' \[Feature:volumegroupsnapshot\]' " non-alpha, feature-tagged tests for latest Kubernetes version"
329
329
configvar CSI_PROW_E2E_FOCUS " $( get_versioned_variable CSI_PROW_E2E_FOCUS " ${csi_prow_kubernetes_version_suffix} " ) " " non-alpha, feature-tagged tests"
330
330
331
331
# Serial vs. parallel is always determined by these regular expressions.
@@ -636,7 +636,7 @@ start_cluster () {
636
636
version=master
637
637
fi
638
638
git_clone https://github.com/kubernetes/kubernetes " ${CSI_PROW_WORK} /src/kubernetes" " $( version_to_git " $version " ) " || die " checking out Kubernetes $version failed"
639
-
639
+ cp " ${CSI_PROW_WORK} " /src/kubernetes/test/e2e/testing-manifests/storage-csi/external-snapshotter/volume-group-snapshots/csi-hostpath-plugin.yaml " ${CSI_PROW_WORK} " /src/kubernetes/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml
640
640
go_version=" $( go_version_for_kubernetes " ${CSI_PROW_WORK} /src/kubernetes" " $version " ) " || die " cannot proceed without knowing Go version for Kubernetes"
641
641
# Changing into the Kubernetes source code directory is a workaround for https://github.com/kubernetes-sigs/kind/issues/1910
642
642
# shellcheck disable=SC2046
@@ -1098,6 +1098,10 @@ run_e2e () (
1098
1098
if [ " ${name} " == " local" ]; then
1099
1099
cd " ${GOPATH} /src/${CSI_PROW_SIDECAR_E2E_PATH} " &&
1100
1100
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
1101
+ elif [ " ${CSI_PROW_ENABLE_GROUP_SNAPSHOT} " = " true" ]; then
1102
+ cd " ${GOPATH} /src/${CSI_PROW_E2E_IMPORT_PATH} " &&
1103
+ 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.test" -- -report-dir " ${ARTIFACTS} "
1104
+ # ./home/prow/go/src/k8s.io/kubernetes/hack/ginkgo-e2e.sh --provider=skeleton --num-nodes=2 --ginkgo.focus=\[Feature:volumegroupsnapshot\] --ginkgo.skip=\[Serial\] --ginkgo.label-filter= --report-dir="${ARTIFACTS}" --disable-log-dump=true
1101
1105
else
1102
1106
cd " ${GOPATH} /src/${CSI_PROW_E2E_IMPORT_PATH} " &&
1103
1107
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.test" -- -report-dir " ${ARTIFACTS} " -storage.testdriver=" ${CSI_PROW_WORK} /test-driver.yaml"
0 commit comments