move flags to test/e2e/common

Signed-off-by: Alex Castilio dos Santos <[email protected]>
microsoft · Nov 22, 2024 · 08db1e0 · 08db1e0
1 parent af261d0
commit 08db1e0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 19 deletions.
diff --git a/test/e2e/common/common.go b/test/e2e/common/common.go
@@ -5,6 +5,7 @@
 package common
 
 import (
+	"flag"
 	"os"
 	"os/user"
 	"strconv"
@@ -22,7 +23,11 @@ const (
 	TestPodNamespace    = "kube-system-test"
 )
 
-var AzureLocations = []string{"eastus2", "northeurope", "uksouth", "centralindia", "westus2"}
+var (
+	AzureLocations = []string{"eastus2", "northeurope", "uksouth", "centralindia", "westus2"}
+	CreateInfra    = flag.Bool("create-infra", true, "create a Resource group, vNET and AKS cluster for testing")
+	DeleteInfra    = flag.Bool("delete-infra", true, "delete a Resource group, vNET and AKS cluster for testing")
+)
 
 func ClusterNameForE2ETest(t *testing.T) string {
 	clusterName := os.Getenv("CLUSTER_NAME")

diff --git a/test/e2e/retina_e2e_test.go b/test/e2e/retina_e2e_test.go
@@ -4,7 +4,6 @@ package retina
 
 import (
 	"crypto/rand"
-	"flag"
 	"math/big"
 	"os"
 	"path/filepath"
@@ -22,8 +21,6 @@ func TestE2ERetina(t *testing.T) {
 	ctx, cancel := helpers.Context(t)
 	defer cancel()
 
-	flag.Parse()
-
 	// Truncate the username to 8 characters
 	clusterName := common.ClusterNameForE2ETest(t)
 
@@ -57,11 +54,11 @@ func TestE2ERetina(t *testing.T) {
 	kubeConfigFilePath := filepath.Join(rootDir, "test", "e2e", "test.pem")
 
 	// CreateTestInfra
-	createTestInfra := types.NewRunner(t, jobs.CreateTestInfra(subID, rg, clusterName, location, kubeConfigFilePath, *createInfra))
+	createTestInfra := types.NewRunner(t, jobs.CreateTestInfra(subID, rg, clusterName, location, kubeConfigFilePath, *common.CreateInfra))
 	createTestInfra.Run(ctx)
 
 	t.Cleanup(func() {
-		if *deleteInfra {
+		if *common.DeleteInfra {
 			_ = jobs.DeleteTestInfra(subID, rg, clusterName, location).Run()
 		}
 	})

diff --git a/test/e2e/scale_test.go b/test/e2e/scale_test.go
@@ -90,11 +90,11 @@ func TestE2ERetina_Scale(t *testing.T) {
 	opt.LabelsToGetMetrics = map[string]string{"k8s-app": "retina"}
 
 	// CreateTestInfra
-	createTestInfra := types.NewRunner(t, jobs.CreateTestInfra(subID, rg, clusterName, location, kubeConfigFilePath, *createInfra))
+	createTestInfra := types.NewRunner(t, jobs.CreateTestInfra(subID, rg, clusterName, location, kubeConfigFilePath, *common.CreateInfra))
 	createTestInfra.Run(ctx)
 
 	t.Cleanup(func() {
-		if *deleteInfra {
+		if *common.DeleteInfra {
 			_ = jobs.DeleteTestInfra(subID, rg, clusterName, location).Run()
 		}
 	})

diff --git a/test/e2e/shared_vars.go b/test/e2e/shared_vars.go