Feature/cspl 3775 extract common code in tests

.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml

@@ -136,7 +136,7 @@ jobs:
                 appframeworksS1,
                 managersecret,
                 managermc,
-                indingsep,
+                indexingestionsep,
                 licensemanager,
                ]
     runs-on: ubuntu-latest

.github/workflows/arm-AL2023-int-test-workflow.yml

@@ -69,7 +69,7 @@ jobs:
             managercrcrud,
             licensemanager,
             managerdeletecr,
-            indingsep,
+            indexingestionsep,
           ]
     runs-on: ubuntu-latest
     needs: build-operator-image-arm-al2023

.github/workflows/arm-RHEL-build-test-push-workflow.yml

@@ -69,7 +69,7 @@ jobs:
             managercrcrud,
             licensemanager,
             managerdeletecr,
-            indingsep,
+            indexingestionsep,
           ]
     runs-on: ubuntu-latest
     needs: build-operator-image-arm-rhel

.github/workflows/arm-RHEL-int-test-workflow.yml

@@ -69,7 +69,7 @@ jobs:
             managercrcrud,
             licensemanager,
             managerdeletecr,
-            indingsep,
+            indexingestionsep,
           ]
     runs-on: ubuntu-latest
     needs: build-operator-image-arm-rhel

.github/workflows/arm-Ubuntu-build-test-push-workflow.yml

@@ -136,7 +136,7 @@ jobs:
                 appframeworksS1,
                 managersecret,
                 managermc,
-                indingsep,
+                indexingestionsep,
                 licensemanager,
               ]
     runs-on: ubuntu-latest

.github/workflows/arm-Ubuntu-int-test-workflow.yml

@@ -69,7 +69,7 @@ jobs:
             managercrcrud,
             licensemanager,
             managerdeletecr,
-            indingsep,
+            indexingestionsep,
           ]
     runs-on: ubuntu-latest
     needs: build-operator-image-arm-ubuntu

.github/workflows/build-test-push-workflow.yml

@@ -200,7 +200,7 @@ jobs:
                 managerappframeworkm4,
                 managersecret,
                 managermc,
-                indingsep,
+                indexingestionsep,
                 licensemanager,
                ]
     runs-on: ubuntu-latest

.github/workflows/distroless-build-test-push-workflow.yml

@@ -195,7 +195,7 @@ jobs:
           managerappframeworkm4,
           managersecret,
           managermc,
-          indingsep,
+          indexingestionsep,
           licensemanager,
         ]
     runs-on: ubuntu-latest

.github/workflows/distroless-int-test-workflow.yml

@@ -73,7 +73,7 @@ jobs:
             managercrcrud,
             licensemanager,
             managerdeletecr,
-            indingsep,
+            indexingestionsep,
           ]
     runs-on: ubuntu-latest
     needs: build-operator-image-distroless

.github/workflows/int-test-workflow.yml

@@ -70,7 +70,7 @@ jobs:
             managercrcrud,
             licensemanager,
             managerdeletecr,
-            indingsep,
+            indexingestionsep,
           ]
     runs-on: ubuntu-latest
     needs: build-operator-image

.github/workflows/manual-int-test-workflow.yml

@@ -29,7 +29,7 @@ jobs:
             managerscaling,
             managercrcrud,
             licensemanager,
-            indingsep,
+            indexingestionsep,
           ]
     runs-on: ubuntu-latest
     env:

.github/workflows/namespace-scope-int-workflow.yml

@@ -25,7 +25,7 @@ jobs:
             managerscaling,
             managercrcrud,
             licensemanager,
-            indingsep,
+            indexingestionsep,
           ]
     runs-on: ubuntu-latest
     env:

.github/workflows/nightly-int-test-workflow.yml

@@ -66,7 +66,7 @@ jobs:
             managerscaling,
             managercrcrud,
             licensemanager,
-            indingsep,
+            indexingestionsep,
           ]
     runs-on: ubuntu-latest
     needs: build-operator-image

test/appframework_aws/c3/appframework_aws_suite_test.go

@@ -22,29 +22,16 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"github.com/joho/godotenv"
 	"github.com/splunk/splunk-operator/test/testenv"
 )
 
-const (
-	// PollInterval specifies the polling interval
-	PollInterval = 5 * time.Second
-
-	// ConsistentPollInterval is the interval to use to consistently check a state is stable
-	ConsistentPollInterval = 200 * time.Millisecond
-	ConsistentDuration     = 2000 * time.Millisecond
-)
-
 var (
 	testenvInstance       *testenv.TestEnv
 	testSuiteName         = "c3appfw-" + testenv.RandomDNSName(3)
 	appListV1             []string
 	appListV2             []string
 	testDataS3Bucket      = os.Getenv("TEST_BUCKET")
 	testS3Bucket          = os.Getenv("TEST_INDEXES_S3_BUCKET")
-	s3AppDirV1            = testenv.AppLocationV1
-	s3AppDirV2            = testenv.AppLocationV2
-	s3PVTestApps          = testenv.PVTestAppsLocation
 	currDir, _            = os.Getwd()
 	downloadDirV1         = filepath.Join(currDir, "c3appfwV1-"+testenv.RandomDNSName(4))
 	downloadDirV2         = filepath.Join(currDir, "c3appfwV2-"+testenv.RandomDNSName(4))
@@ -55,87 +42,18 @@ var (
 func TestBasic(t *testing.T) {
 	RegisterFailHandler(Fail)
 
-	// Find and load the .env file from the current directory upwards
-	err := loadEnvFile()
-	Expect(err).ToNot(HaveOccurred(), "Error loading .env file")
+	Expect(testenv.LoadEnvFile()).ToNot(HaveOccurred(), "Error loading .env file")
 
 	sc, _ := GinkgoConfiguration()
 	sc.Timeout = 240 * time.Minute
 
 	RunSpecs(t, "Running "+testSuiteName, sc)
 }
 
-//func TestMain(m *testing.M) {
-// Run the tests
-//    os.Exit(m.Run())
-//}
-
-// loadEnvFile traverses up the directory tree to find a .env file
-func loadEnvFile() error {
-	// Get the current working directory
-	dir, err := os.Getwd()
-	if err != nil {
-		return err
-	}
-
-	// Traverse up the directory tree
-	for {
-		// Check if .env file exists in the current directory
-		envFile := filepath.Join(dir, ".env")
-		if _, err := os.Stat(envFile); err == nil {
-			// .env file found, load it
-			return godotenv.Load(envFile)
-		}
-
-		// Move up to the parent directory
-		parentDir := filepath.Dir(dir)
-		if parentDir == dir {
-			// Reached the root directory
-			return nil
-		}
-		dir = parentDir
-	}
-}
-
 var _ = BeforeSuite(func() {
-	var err error
-	testenvInstance, err = testenv.NewDefaultTestEnv(testSuiteName)
-	Expect(err).ToNot(HaveOccurred())
-
-	if testenv.ClusterProvider == "eks" {
-		// Create a list of apps to upload to S3
-		appListV1 = testenv.BasicApps
-		appFileList := testenv.GetAppFileList(appListV1)
-
-		// Download V1 Apps from S3
-		err = testenv.DownloadFilesFromS3(testDataS3Bucket, s3AppDirV1, downloadDirV1, appFileList)
-		Expect(err).To(Succeed(), "Unable to download V1 app files")
-
-		// Create a list of apps to upload to S3 after poll period
-		appListV2 = append(appListV1, testenv.NewAppsAddedBetweenPolls...)
-		appFileList = testenv.GetAppFileList(appListV2)
-
-		// Download V2 Apps from S3
-		err = testenv.DownloadFilesFromS3(testDataS3Bucket, s3AppDirV2, downloadDirV2, appFileList)
-		Expect(err).To(Succeed(), "Unable to download V2 app files")
-	} else {
-		testenvInstance.Log.Info("Skipping Before Suite Setup", "Cluster Provider", testenv.ClusterProvider)
-	}
-
+	testenvInstance, appListV1, appListV2 = testenv.SetupS3AppsSuite(testSuiteName, testDataS3Bucket, testenv.AppLocationV1, downloadDirV1, testenv.AppLocationV2, downloadDirV2)
 })
 
 var _ = AfterSuite(func() {
-	if testenvInstance != nil {
-		Expect(testenvInstance.Teardown()).ToNot(HaveOccurred())
-	}
-
-	if testenvInstance != nil {
-		Expect(testenvInstance.Teardown()).ToNot(HaveOccurred())
-	}
-
-	// Delete locally downloaded app files
-	err := os.RemoveAll(downloadDirV1)
-	Expect(err).To(Succeed(), "Unable to delete locally downloaded V1 app files")
-	err = os.RemoveAll(downloadDirV2)
-	Expect(err).To(Succeed(), "Unable to delete locally downloaded V2 app files")
+	testenv.CleanupLocalAppDownloads(testenvInstance, downloadDirV1, downloadDirV2)
 })