Address vmware-tanzu#7353 (comment)

Signed-off-by: Tiger Kaovilai <[email protected]>
kaovilai · Feb 2, 2024 · 33f3f7e · 33f3f7e
1 parent e6750d5
commit 33f3f7e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -206,6 +206,18 @@ func TestE2e(t *testing.T) {
 		t.Skip("Skipping E2E tests")
 	}
 
+	if VeleroCfg.CloudProvider != "kind" {
+		fmt.Println("For cloud platforms, object store plugin provider will be set as cloud provider")
+		// If ObjectStoreProvider is not provided, then using the value same as CloudProvider
+		if VeleroCfg.ObjectStoreProvider == "" {
+			VeleroCfg.ObjectStoreProvider = VeleroCfg.CloudProvider
+		}
+	} else {
+		if VeleroCfg.ObjectStoreProvider == "" {
+			t.Error(errors.New("No object store provider specified - must be specified when using kind as the cloud provider")) // Must have an object store provider
+		}
+	}
+
 	var err error
 	if err = GetKubeconfigContext(); err != nil {
 		fmt.Println(err)

diff --git a/test/util/velero/install.go b/test/util/velero/install.go
@@ -75,17 +75,6 @@ func VeleroInstall(ctx context.Context, veleroCfg *VeleroConfig, isStandbyCluste
 	if isStandbyCluster {
 		veleroCfg.CloudProvider = veleroCfg.StandbyClusterCloudProvider
 	}
-	if veleroCfg.CloudProvider != "kind" {
-		fmt.Println("For cloud platforms, object store plugin provider will be set as cloud provider")
-		// If ObjectStoreProvider is not provided, then using the value same as CloudProvider
-		if veleroCfg.ObjectStoreProvider == "" {
-			veleroCfg.ObjectStoreProvider = veleroCfg.CloudProvider
-		}
-	} else {
-		if veleroCfg.ObjectStoreProvider == "" {
-			return errors.New("No object store provider specified - must be specified when using kind as the cloud provider") // Must have an object store provider
-		}
-	}
 
 	pluginsTmp, err := getPlugins(ctx, *veleroCfg)
 	if err != nil {