From 7e5987df7118d37532fc2ab5ee0905e242f0237e Mon Sep 17 00:00:00 2001
From: Matthew Wong <mattwon@amazon.com>
Date: Tue, 16 Mar 2021 12:33:31 -0700
Subject: [PATCH] Run all testsuites.CSISuites instead of listing each

---
 tests/e2e-kubernetes/e2e_test.go | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/tests/e2e-kubernetes/e2e_test.go b/tests/e2e-kubernetes/e2e_test.go
index 77c3709333..ee1a3a944e 100644
--- a/tests/e2e-kubernetes/e2e_test.go
+++ b/tests/e2e-kubernetes/e2e_test.go
@@ -51,7 +51,8 @@ func init() {
 	}
 	framework.RegisterCommonFlags(flag.CommandLine)
 	framework.RegisterClusterFlags(flag.CommandLine)
-	_ = flag.Set("storage.migratedPlugins", "kubernetes.io/aws-ebs")
+	// TODO wongma7 set this when the metrics check bug has been fixed
+	// _ = flag.Set("storage.migratedPlugins", "kubernetes.io/aws-ebs")
 	_ = flag.Set("provider", "aws")
 	flag.Parse()
 	framework.AfterReadingAllFlags(&framework.TestContext)
@@ -78,18 +79,6 @@ func TestEBSCSI(t *testing.T) {
 	ginkgo.RunSpecsWithDefaultAndCustomReporters(t, "EBS CSI Migration Suite", r)
 }
 
-// List of testSuites to be executed in below loop
-var csiTestSuites = []func() testsuites.TestSuite{
-	testsuites.InitVolumesTestSuite,
-	testsuites.InitVolumeIOTestSuite,
-	testsuites.InitVolumeModeTestSuite,
-	testsuites.InitSubPathTestSuite,
-	testsuites.InitProvisioningTestSuite,
-	testsuites.InitSnapshottableTestSuite,
-	testsuites.InitVolumeExpandTestSuite,
-	testsuites.InitMultiVolumeTestSuite,
-}
-
 var _ = ginkgo.Describe("[ebs-csi-migration] EBS CSI Migration", func() {
 	// Init the *in-tree* driver.
 	// The CSIMigration & CSIMigrationAWS feature gates must be enabled on the cluster.
@@ -97,6 +86,6 @@ var _ = ginkgo.Describe("[ebs-csi-migration] EBS CSI Migration", func() {
 	// validate that CSI, not in-tree, operations are happening.
 	driver := drivers.InitAwsDriver()
 	ginkgo.Context(testsuites.GetDriverNameWithFeatureTags(driver), func() {
-		testsuites.DefineTestSuite(driver, csiTestSuites)
+		testsuites.DefineTestSuite(driver, testsuites.CSISuites)
 	})
 })