@@ -330,7 +330,11 @@ configvar CSI_SNAPSHOTTER_VERSION 'v2.0.0-rc4' "external-snapshotter version tag
330330# whether they can run with the current cluster provider, but until
331331# they are, we filter them out by name. Like the other test selection
332332# variables, this is again a space separated list of regular expressions.
333- configvar CSI_PROW_E2E_SKIP ' Disruptive' " tests that need to be skipped"
333+ #
334+ # "different node" test skips can be removed once
335+ # https://github.com/kubernetes/kubernetes/pull/82678 has been backported
336+ # to all the K8s versions we test against
337+ configvar CSI_PROW_E2E_SKIP ' Disruptive|different\s+node' " tests that need to be skipped"
334338
335339# This is the directory for additional result files. Usually set by Prow, but
336340# if not (for example, when invoking manually) it defaults to the work directory.
@@ -526,6 +530,7 @@ apiVersion: kind.sigs.k8s.io/v1alpha3
526530nodes:
527531- role: control-plane
528532- role: worker
533+ - role: worker
529534EOF
530535
531536 # kubeadm has API dependencies between apiVersion and Kubernetes version
@@ -840,10 +845,6 @@ run_e2e () (
840845 install_e2e || die " building e2e.test failed"
841846 install_ginkgo || die " installing ginkgo failed"
842847
843- # TODO (?): multi-node cluster (depends on https://github.com/kubernetes-csi/csi-driver-host-path/pull/14).
844- # When running on a multi-node cluster, we need to figure out where the
845- # hostpath driver was deployed and set ClientNodeName accordingly.
846-
847848 generate_test_driver > " ${CSI_PROW_WORK} /test-driver.yaml" || die " generating test-driver.yaml failed"
848849
849850 # Rename, merge and filter JUnit files. Necessary in case that we run the E2E suite again
0 commit comments