From 45923180e800e2e22e4b43ddde2f6dbf6e6471b3 Mon Sep 17 00:00:00 2001 From: Arjun Kondur Date: Fri, 22 Nov 2024 12:39:42 -0600 Subject: [PATCH] Split managermc into two different matrix entries, increase suite timeouts selectively --- .github/workflows/int-test-workflow.yml | 3 ++- .github/workflows/manual-int-test-workflow.yml | 3 ++- .github/workflows/namespace-scope-int-workflow.yml | 3 ++- .github/workflows/nightly-int-test-workflow.yml | 3 ++- .../appframework_aws/c3/appframework_aws_suite_test.go | 5 ++++- .../appframework_aws/m4/appframework_aws_suite_test.go | 5 ++++- .../manager_monitoring_console_test.go | 10 +++++----- .../monitoring_console_suite_test.go | 5 ++++- test/secret/manager_secret_m4_test.go | 2 +- test/secret/secret_m4_test.go | 2 +- 10 files changed, 27 insertions(+), 14 deletions(-) diff --git a/.github/workflows/int-test-workflow.yml b/.github/workflows/int-test-workflow.yml index 3145b3f07..edc94a655 100644 --- a/.github/workflows/int-test-workflow.yml +++ b/.github/workflows/int-test-workflow.yml @@ -61,7 +61,8 @@ jobs: managerappframeworkm4, managersecret, managersmartstore, - managermc, + managermc1, + managermc2, managercrcrud, licensemanager, managerdeletecr, diff --git a/.github/workflows/manual-int-test-workflow.yml b/.github/workflows/manual-int-test-workflow.yml index f358f75a5..bfd52f5fa 100644 --- a/.github/workflows/manual-int-test-workflow.yml +++ b/.github/workflows/manual-int-test-workflow.yml @@ -18,7 +18,8 @@ jobs: managerappframeworkm4, managersecret, managersmartstore, - managermc, + managermc1, + managermc2, managerscaling, managercrcrud, licensemanager, diff --git a/.github/workflows/namespace-scope-int-workflow.yml b/.github/workflows/namespace-scope-int-workflow.yml index 62103d8cb..5b188d379 100644 --- a/.github/workflows/namespace-scope-int-workflow.yml +++ b/.github/workflows/namespace-scope-int-workflow.yml @@ -14,7 +14,8 @@ jobs: managerappframeworkm4, managersecret, managersmartstore, - managermc, + managermc1, + managermc2, managerscaling, managercrcrud, licensemanager, diff --git a/.github/workflows/nightly-int-test-workflow.yml b/.github/workflows/nightly-int-test-workflow.yml index fa018be67..ecb717d48 100644 --- a/.github/workflows/nightly-int-test-workflow.yml +++ b/.github/workflows/nightly-int-test-workflow.yml @@ -58,7 +58,8 @@ jobs: managerappframeworkm4, managersecret, managersmartstore, - managermc, + managermc1, + managermc2, managerscaling, managercrcrud, licensemanager, diff --git a/test/appframework_aws/c3/appframework_aws_suite_test.go b/test/appframework_aws/c3/appframework_aws_suite_test.go index 289b6b9ed..aa1dde42d 100644 --- a/test/appframework_aws/c3/appframework_aws_suite_test.go +++ b/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) { diff --git a/test/appframework_aws/m4/appframework_aws_suite_test.go b/test/appframework_aws/m4/appframework_aws_suite_test.go index 91cf5c852..aa21c7084 100644 --- a/test/appframework_aws/m4/appframework_aws_suite_test.go +++ b/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() { diff --git a/test/monitoring_console/manager_monitoring_console_test.go b/test/monitoring_console/manager_monitoring_console_test.go index a783996d5..8b4fb5ff0 100644 --- a/test/monitoring_console/manager_monitoring_console_test.go +++ b/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" diff --git a/test/monitoring_console/monitoring_console_suite_test.go b/test/monitoring_console/monitoring_console_suite_test.go index c7a571f63..83bf2060d 100644 --- a/test/monitoring_console/monitoring_console_suite_test.go +++ b/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() { diff --git a/test/secret/manager_secret_m4_test.go b/test/secret/manager_secret_m4_test.go index 3e4aa8f9c..134b688ef 100644 --- a/test/secret/manager_secret_m4_test.go +++ b/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") }) diff --git a/test/secret/secret_m4_test.go b/test/secret/secret_m4_test.go index 73ecbf922..8b63e012b 100644 --- a/test/secret/secret_m4_test.go +++ b/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") })