Split managermc into two different matrix entries, increase suite tim…

…eouts selectively

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

@@ -61,7 +61,8 @@ jobs:
             managerappframeworkm4,
             managersecret,
             managersmartstore,
-            managermc,
+            managermc1,
+            managermc2,
             managercrcrud,
             licensemanager,
             managerdeletecr,

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

@@ -18,7 +18,8 @@ jobs:
             managerappframeworkm4,
             managersecret,
             managersmartstore,
-            managermc,
+            managermc1,
+            managermc2,
             managerscaling,
             managercrcrud,
             licensemanager,

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

@@ -14,7 +14,8 @@ jobs:
             managerappframeworkm4,
             managersecret,
             managersmartstore,
-            managermc,
+            managermc1,
+            managermc2,
             managerscaling,
             managercrcrud,
             licensemanager,

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

@@ -58,7 +58,8 @@ jobs:
             managerappframeworkm4,
             managersecret,
             managersmartstore,
-            managermc,
+            managermc1,
+            managermc2,
             managerscaling,
             managercrcrud,
             licensemanager,

test/appframework_aws/c3/appframework_aws_suite_test.go

@@ -60,7 +60,10 @@ func TestBasic(t *testing.T) {
 	}
 	RegisterFailHandler(Fail)
 
-	RunSpecs(t, "Running "+testSuiteName)
+	sc, _ := GinkgoConfiguration()
+	sc.Timeout = 240 * time.Minute
+
+	RunSpecs(t, "Running "+testSuiteName, sc)
 }
 
 //func TestMain(m *testing.M) {

test/appframework_aws/m4/appframework_aws_suite_test.go

@@ -55,7 +55,10 @@ func TestBasic(t *testing.T) {
 
 	RegisterFailHandler(Fail)
 
-	RunSpecs(t, "Running "+testSuiteName)
+	sc, _ := GinkgoConfiguration()
+	sc.Timeout = 240 * time.Minute
+
+	RunSpecs(t, "Running "+testSuiteName, sc)
 }
 
 var _ = BeforeSuite(func() {

test/monitoring_console/manager_monitoring_console_test.go

@@ -164,7 +164,7 @@ var _ = Describe("Monitoring Console test", func() {
 	})
 
 	Context("Standalone deployment (S1)", func() {
-		It("managermc, integration: can deploy a MC with standalone instance and update MC with new standalone deployment", func() {
+		It("managermc1, integration: can deploy a MC with standalone instance and update MC with new standalone deployment", func() {
 			/*
 				Test Steps
 				1.  Deploy Standalone
@@ -319,7 +319,7 @@ var _ = Describe("Monitoring Console test", func() {
 	})
 
 	Context("Standalone deployment with Scale up", func() {
-		It("managermc, integration: can deploy a MC with standalone instance and update MC when standalone is scaled up", func() {
+		It("managermc1, integration: can deploy a MC with standalone instance and update MC when standalone is scaled up", func() {
 			/*
 				Test Steps
 				1.  Deploy Standalone
@@ -584,7 +584,7 @@ var _ = Describe("Monitoring Console test", func() {
 	})
 
 	Context("Clustered deployment (C3 - clustered indexer, search head cluster)", func() {
-		It("managermc, integration: MC can configure SHC, indexer instances and reconfigure to new MC", func() {
+		It("managermc1, integration: MC can configure SHC, indexer instances and reconfigure to new MC", func() {
 			/*
 				Test Steps
 				1. Deploy Single Site Indexer Cluster
@@ -809,7 +809,7 @@ var _ = Describe("Monitoring Console test", func() {
 	})
 
 	Context("Multisite Clustered deployment (M4 - 3 Site clustered indexer, search head cluster)", func() {
-		It("managermc, integration: MC can configure SHC, indexer instances and reconfigure Cluster Manager to new Monitoring Console", func() {
+		It("managermc2, integration: MC can configure SHC, indexer instances and reconfigure Cluster Manager to new Monitoring Console", func() {
 			/*
 				Test Steps
 				1. Deploy Multisite Indexer Cluster
@@ -946,7 +946,7 @@ var _ = Describe("Monitoring Console test", func() {
 	})
 
 	Context("Standalone deployment (S1)", func() {
-		It("managermc, integration: can deploy a MC with standalone instance and update MC with new standalone deployment of similar names", func() {
+		It("managermc2, integration: can deploy a MC with standalone instance and update MC with new standalone deployment of similar names", func() {
 			/*
 				Test Steps
 				1.  Deploy Standalone with name "search-head-adhoc"

test/monitoring_console/monitoring_console_suite_test.go

@@ -44,7 +44,10 @@ func TestBasic(t *testing.T) {
 
 	RegisterFailHandler(Fail)
 
-	RunSpecs(t, "Running "+testSuiteName)
+	sc, _ := GinkgoConfiguration()
+	sc.Timeout = 240 * time.Minute
+
+	RunSpecs(t, "Running "+testSuiteName, sc)
 }
 
 var _ = BeforeSuite(func() {

test/secret/manager_secret_m4_test.go

@@ -37,7 +37,7 @@ var _ = Describe("Secret Test for M4 SVA", func() {
 		// it takes more than 3000 seconds for one of the test case
 		testcaseEnvInst, err = testenv.NewDefaultTestCaseEnv(testenvInstance.GetKubeClient(), name)
 		Expect(err).To(Succeed(), "Unable to create testcaseenv")
-		testenv.SpecifiedTestTimeout = 4000
+		testenv.SpecifiedTestTimeout = 40000
 		deployment, err = testcaseEnvInst.NewDeployment(testenv.RandomDNSName(3))
 		Expect(err).To(Succeed(), "Unable to create deployment")
 	})

test/secret/secret_m4_test.go

@@ -38,7 +38,7 @@ var _ = Describe("Secret Test for M4 SVA", func() {
 		// it takes more than 3000 seconds for one of the test case
 		testcaseEnvInst, err = testenv.NewDefaultTestCaseEnv(testenvInstance.GetKubeClient(), name)
 		Expect(err).To(Succeed(), "Unable to create testcaseenv")
-		testenv.SpecifiedTestTimeout = 4000
+		testenv.SpecifiedTestTimeout = 40000
 		deployment, err = testcaseEnvInst.NewDeployment(testenv.RandomDNSName(3))
 		Expect(err).To(Succeed(), "Unable to create deployment")
 	})