diff --git a/.github/workflows/build-test-push-workflow.yml b/.github/workflows/build-test-push-workflow.yml index dab0c9569..355448ccc 100644 --- a/.github/workflows/build-test-push-workflow.yml +++ b/.github/workflows/build-test-push-workflow.yml @@ -155,7 +155,7 @@ jobs: matrix: test: [ basic, - appframeworks1, + appframeworksS1, managerappframeworkc3, managerappframeworkm4, managersecret, diff --git a/.github/workflows/int-test-workflow.yml b/.github/workflows/int-test-workflow.yml index e4b36cea1..5d0418fd6 100644 --- a/.github/workflows/int-test-workflow.yml +++ b/.github/workflows/int-test-workflow.yml @@ -50,12 +50,13 @@ jobs: matrix: test: [ - appframeworks1, + appframeworksS1, managerappframeworkc3, 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..a5cf70cbc 100644 --- a/.github/workflows/manual-int-test-workflow.yml +++ b/.github/workflows/manual-int-test-workflow.yml @@ -13,12 +13,13 @@ jobs: matrix: test: [ - appframeworks1, + appframeworksS1, managerappframeworkc3, 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..973b43c13 100644 --- a/.github/workflows/namespace-scope-int-workflow.yml +++ b/.github/workflows/namespace-scope-int-workflow.yml @@ -9,12 +9,13 @@ jobs: matrix: test: [ - appframeworks1, + appframeworksS1, managerappframeworkc3, 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..e10aa1120 100644 --- a/.github/workflows/nightly-int-test-workflow.yml +++ b/.github/workflows/nightly-int-test-workflow.yml @@ -53,12 +53,13 @@ jobs: matrix: test: [ - appframeworks1, + appframeworksS1, managerappframeworkc3, managerappframeworkm4, managersecret, managersmartstore, - managermc, + managermc1, + managermc2, managerscaling, managercrcrud, licensemanager, diff --git a/pkg/splunk/client/azureblobclient.go b/pkg/splunk/client/azureblobclient.go index 679a113f4..c74036269 100644 --- a/pkg/splunk/client/azureblobclient.go +++ b/pkg/splunk/client/azureblobclient.go @@ -138,6 +138,9 @@ func NewAzureBlobClient( var serviceURL string if endpoint != "" { serviceURL = endpoint + if serviceURL[len(serviceURL)-1] == '/' { + serviceURL = serviceURL[:len(serviceURL)-1] + } } else if region != "" { serviceURL = fmt.Sprintf("https://%s.blob.%s.core.windows.net", storageAccountName, region) } else { @@ -203,7 +206,7 @@ func NewAzureBlobClient( // Initialize the container client with Token Credential. rawContainerClient, err := container.NewClient( - fmt.Sprintf("%s%s", serviceURL, bucketName), + fmt.Sprintf("%s/%s", serviceURL, bucketName), tokenCredential, nil, ) 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/appframework_aws/s1/appframework_aws_test.go b/test/appframework_aws/s1/appframework_aws_test.go index 0ec65486e..51f360820 100644 --- a/test/appframework_aws/s1/appframework_aws_test.go +++ b/test/appframework_aws/s1/appframework_aws_test.go @@ -79,7 +79,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("smoke, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps then upgrade them", func() { + It("smoke, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps then upgrade them", func() { /* Test Steps ################## SETUP #################### @@ -250,7 +250,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("smoke, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps then downgrade them", func() { + It("smoke, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps then downgrade them", func() { /* Test Steps ################## SETUP #################### @@ -413,7 +413,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("s1, smoke, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, install apps on new pod, scale down", func() { + It("s1, smoke, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, install apps on new pod, scale down", func() { /* Test Steps ################## SETUP #################### @@ -608,7 +608,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("s1, integration, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, upgrade apps", func() { + It("s1, integration, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, upgrade apps", func() { /* Test Steps ################## SETUP #################### @@ -742,7 +742,7 @@ var _ = Describe("s1appfw test", func() { // ES App Installation not supported at the time. Will be added back at a later time. Context("Standalone deployment (S1) with App Framework", func() { - It("s1, integration, appframeworks1, appframework: can deploy a Standalone and have ES app installed", func() { + It("s1, integration, appframeworksS1, appframework: can deploy a Standalone and have ES app installed", func() { /* Test Steps ################## SETUP #################### @@ -843,7 +843,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled and install around 350MB of apps at once", func() { + It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled and install around 350MB of apps at once", func() { /* Test Steps ################## SETUP #################### @@ -912,7 +912,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("s1, smoke, appframeworks1, appframework: can deploy a standalone instance with App Framework enabled for manual poll", func() { + It("s1, smoke, appframeworksS1, appframework: can deploy a standalone instance with App Framework enabled for manual poll", func() { /* Test Steps ################## SETUP #################### @@ -1090,7 +1090,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworks1, appframework: can deploy Several standalone CRs in the same namespace with App Framework enabled", func() { + It("integration, s1, appframeworksS1, appframework: can deploy Several standalone CRs in the same namespace with App Framework enabled", func() { /* Test Steps ################## SETUP #################### @@ -1191,7 +1191,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworks1, appframework: can add new apps to app source while install is in progress and have all apps installed", func() { + It("integration, s1, appframeworksS1, appframework: can add new apps to app source while install is in progress and have all apps installed", func() { /* Test Steps ################## SETUP #################### @@ -1303,7 +1303,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworks1, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app install is in progress", func() { + It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app install is in progress", func() { /* Test Steps ################## SETUP #################### @@ -1399,7 +1399,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworks1, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app download is in progress", func() { + It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app download is in progress", func() { /* Test Steps ################## SETUP #################### @@ -1467,7 +1467,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install an app then disable it and remove it from app source", func() { + It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install an app then disable it and remove it from app source", func() { /* Test Steps ################## SETUP #################### @@ -1561,7 +1561,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, attempt to update using incorrect S3 credentials", func() { + It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, attempt to update using incorrect S3 credentials", func() { /* Test Steps ################## SETUP #################### @@ -1698,7 +1698,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworks1, appframework: Deploy a Standalone instance with App Framework enabled and update apps after app download is completed", func() { + It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and update apps after app download is completed", func() { /* Test Steps ################## SETUP #################### @@ -1782,7 +1782,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworks1, appframework: can deploy a Standalone instance and install a bigger volume of apps than the operator PV disk space", func() { + It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance and install a bigger volume of apps than the operator PV disk space", func() { /* Test Steps ################## SETUP #################### @@ -1857,7 +1857,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworks1, appframework: Deploy a Standalone instance with App Framework enabled and delete apps from app directory when app download is complete", func() { + It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and delete apps from app directory when app download is complete", func() { /* Test Steps ################## SETUP #################### @@ -1928,7 +1928,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("smoke, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps and check isDeploymentInProgress is set for Standaloen and MC CR's", func() { + It("smoke, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps and check isDeploymentInProgress is set for Standaloen and MC CR's", func() { /* Test Steps ################## SETUP #################### diff --git a/test/appframework_gcp/c3/appframework_gcs_test.go b/test/appframework_gcp/c3/appframework_gcs_test.go index a56a97247..d73a02eeb 100644 --- a/test/appframework_gcp/c3/appframework_gcs_test.go +++ b/test/appframework_gcp/c3/appframework_gcs_test.go @@ -18,6 +18,7 @@ import ( //"encoding/json" "fmt" "path/filepath" + //"strings" //"time" @@ -89,7 +90,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework", func() { - It(" c3gcp, masterappframeworkc3gcp, appframeworkgcp, c3_gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then upgrade them", func() { + It(" c3gcp, masterappframeworkc3gcp, c3_gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then upgrade them", func() { /* Test Steps ################## SETUP #################### @@ -308,7 +309,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Single Site Indexer Cluster with Search Head Cluster (C3) with App Framework", func() { - It(" c3gcp, masterappframeworkc3gcp, appframeworkgcp, c3_gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then downgrade them", func() { + It(" c3gcp, masterappframeworkc3gcp, c3_gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then downgrade them", func() { /* Test Steps ################## SETUP #################### @@ -515,7 +516,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Clustered deployment (C3 - clustered indexer, search head cluster)", func() { - It(" c3gcp, masterappframeworkc3gcp, appframeworkgcp, c3_gcp_sanity: can deploy a C3 SVA and have apps installed locally on Cluster Manager and Deployer", func() { + It(" c3gcp, masterappframeworkc3gcp, c3_gcp_sanity: can deploy a C3 SVA and have apps installed locally on Cluster Manager and Deployer", func() { /* Test Steps ################## SETUP #################### @@ -654,7 +655,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework", func() { - It(" c3gcp, masterappframeworkc3gcp, appframeworkgcp, c3_gcp_sanity: can deploy a C3 SVA with App Framework enabled and check isDeploymentInProgressFlag for CM and SHC CR's", func() { + It(" c3gcp, masterappframeworkc3gcp, c3_gcp_sanity: can deploy a C3 SVA with App Framework enabled and check isDeploymentInProgressFlag for CM and SHC CR's", func() { /* Test Steps diff --git a/test/appframework_gcp/c3/manager_appframework_test.go b/test/appframework_gcp/c3/manager_appframework_test.go index b1b518198..4bf7d8dcd 100644 --- a/test/appframework_gcp/c3/manager_appframework_test.go +++ b/test/appframework_gcp/c3/manager_appframework_test.go @@ -87,7 +87,7 @@ var _ = Describe("c3appfw test", func() { }) XContext("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework", func() { - It(" c3gcp, managerappframeworkc3gcp, appframeworkgcp, c3_mgr_gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then upgrade them", func() { + It(" c3gcp, c3_mgr_gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then upgrade them", func() { /* Test Steps ################## SETUP #################### @@ -306,7 +306,7 @@ var _ = Describe("c3appfw test", func() { }) XContext("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework and Image Upgrade", func() { - It(" c3gcp, managerappframeworkc3gcpt, appframeworkgcp, c3_mgr_gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then upgrade the image and apps", func() { + It(" c3gcp, c3_mgr_gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then upgrade the image and apps", func() { //################## SETUP #################### @@ -452,7 +452,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Single Site Indexer Cluster with Search Head Cluster (C3) with App Framework", func() { - It(" c3gcp, managerappframeworkc3gcp, appframeworkgcp, c3_mgr_gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then downgrade them", func() { + It(" c3gcp, c3_mgr_gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then downgrade them", func() { /* Test Steps ################## SETUP #################### @@ -659,7 +659,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Single Site Indexer Cluster with Search Head Cluster (C3) with App Framework", func() { - It("integration, c3, managerappframeworkc3, appframework: can deploy a C3 SVA with App Framework enabled, install apps, scale up clusters, install apps on new pods, scale down", func() { + It("integration, c3, appframework: can deploy a C3 SVA with App Framework enabled, install apps, scale up clusters, install apps on new pods, scale down", func() { /* Test Steps ################## SETUP #################### @@ -937,7 +937,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Clustered deployment (C3 - clustered indexer, search head cluster)", func() { - It(" c3gcp, managerappframeworkc3gcp, appframeworkgcp, c3_mgr_gcp_sanity: can deploy a C3 SVA and have apps installed locally on Cluster Manager and Deployer", func() { + It(" c3gcp, c3_mgr_gcp_sanity: can deploy a C3 SVA and have apps installed locally on Cluster Manager and Deployer", func() { /* Test Steps ################## SETUP #################### @@ -1076,7 +1076,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Clustered deployment (C3 - clustered indexer, search head cluster)", func() { - It("c3, integration, managerappframeworkc3, appframework: can deploy a C3 SVA with apps installed locally on Cluster Manager and Deployer, cluster-wide on Peers and Search Heads, then upgrade them", func() { + It("c3, integration, appframework: can deploy a C3 SVA with apps installed locally on Cluster Manager and Deployer, cluster-wide on Peers and Search Heads, then upgrade them", func() { /* Test Steps ################## SETUP #################### @@ -1287,7 +1287,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Clustered deployment (C3 - clustered indexer, search head cluster)", func() { - It("c3, integration, managerappframeworkc3, appframework: can deploy a C3 SVA with apps installed locally on Cluster Manager and Deployer, cluster-wide on Peers and Search Heads, then downgrade them", func() { + It("c3, integration, appframework: can deploy a C3 SVA with apps installed locally on Cluster Manager and Deployer, cluster-wide on Peers and Search Heads, then downgrade them", func() { /* Test Steps ################## SETUP #################### @@ -1495,7 +1495,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Clustered deployment (C3 - clustered indexer, search head cluster)", func() { - It("integration, c3, managerappframeworkc3, appframework: can deploy a C3 SVA instance with App Framework enabled and install above 200MB of apps at once", func() { + It("integration, c3, appframework: can deploy a C3 SVA instance with App Framework enabled and install above 200MB of apps at once", func() { /* Test Steps ################## SETUP #################### @@ -1587,7 +1587,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Single Site Indexer Cluster with Search Head Cluster (C3) with App Framework", func() { - It("integration, c3, managerappframeworkc3, appframework: can deploy a C3 SVA with App Framework enabled for manual update", func() { + It("integration, c3, appframework: can deploy a C3 SVA with App Framework enabled for manual update", func() { /* Test Steps ################## SETUP #################### * Upload V1 apps to Gcs for Monitoring Console @@ -1831,7 +1831,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Clustered deployment (C3 - clustered indexer, search head cluster)", func() { - It("integration, c3, managerappframeworkc3, appframework: can deploy a C3 SVA and have apps installed and updated locally on Cluster Manager and Deployer for manual polling", func() { + It("integration, c3, appframework: can deploy a C3 SVA and have apps installed and updated locally on Cluster Manager and Deployer for manual polling", func() { /* Test Steps ################## SETUP #################### @@ -2014,7 +2014,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Clustered deployment (C3 - clustered indexer, search head cluster)", func() { - It("c3, integration, managerappframeworkc3, appframework: can deploy a C3 SVA with apps installed locally on Cluster Manager and Deployer, cluster-wide on Peers and Search Heads, then upgrade them via a manual poll", func() { + It("c3, integration, appframework: can deploy a C3 SVA with apps installed locally on Cluster Manager and Deployer, cluster-wide on Peers and Search Heads, then upgrade them via a manual poll", func() { /* Test Steps ################## SETUP #################### @@ -2238,7 +2238,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework", func() { - It("integration, c3, managerappframeworkc3, appframework: can deploy a C3, add new apps to app source while install is in progress and have all apps installed locally on Cluster Manager and Deployer", func() { + It("integration, c3, appframework: can deploy a C3, add new apps to app source while install is in progress and have all apps installed locally on Cluster Manager and Deployer", func() { /* Test Steps ################## SETUP #################### @@ -2366,7 +2366,7 @@ var _ = Describe("c3appfw test", func() { }) // Vivek need testing Context("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework", func() { - It("integration, c3, managerappframeworkc3, appframework: can deploy a C3, add new apps to app source while install is in progress and have all apps installed cluster-wide", func() { + It("integration, c3, appframework: can deploy a C3, add new apps to app source while install is in progress and have all apps installed cluster-wide", func() { /* Test Steps ################## SETUP #################### @@ -2501,7 +2501,7 @@ var _ = Describe("c3appfw test", func() { }) // Vivek need testing Context("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework", func() { - It("integration, c3, managerappframeworkc3, appframework: can deploy a C3 SVA with App Framework enabled and reset operator pod while app install is in progress", func() { + It("integration, c3, appframework: can deploy a C3 SVA with App Framework enabled and reset operator pod while app install is in progress", func() { /* Test Steps ################## SETUP #################### @@ -2595,7 +2595,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework", func() { - It("integration, c3, managerappframeworkc3, appframework: can deploy a C3 SVA with App Framework enabled and reset operator pod while app download is in progress", func() { + It("integration, c3, appframework: can deploy a C3 SVA with App Framework enabled and reset operator pod while app download is in progress", func() { /* Test Steps ################## SETUP #################### @@ -2689,7 +2689,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework", func() { - It("integration, c3, managerappframeworkc3, appframework: can deploy a C3 SVA with App Framework enabled, install an app, then disable it by using a disabled version of the app and then remove it from app source", func() { + It("integration, c3, appframework: can deploy a C3 SVA with App Framework enabled, install an app, then disable it by using a disabled version of the app and then remove it from app source", func() { /* Test Steps ################## SETUP #################### @@ -2798,7 +2798,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework", func() { - It("integration, c3, managerappframeworkc3, appframework: can deploy a C3 SVA with App Framework enabled and update apps after app download is completed", func() { + It("integration, c3, appframework: can deploy a C3 SVA with App Framework enabled and update apps after app download is completed", func() { /* Test Steps ################## SETUP #################### @@ -2918,7 +2918,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Clustered deployment (C3 - clustered indexer, search head cluster)", func() { - It("c3, integration, managerappframeworkc3, appframework: can deploy a C3 SVA and install a bigger volume of apps than the operator PV disk space", func() { + It("c3, integration, appframework: can deploy a C3 SVA and install a bigger volume of apps than the operator PV disk space", func() { /* Test Steps ################## SETUP #################### @@ -3013,7 +3013,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework", func() { - It("integration, c3, managerappframeworkc3, appframework: can deploy a C3 SVA with App Framework enabled and delete apps from app directory when download is complete", func() { + It("integration, c3, appframework: can deploy a C3 SVA with App Framework enabled and delete apps from app directory when download is complete", func() { /* Test Steps ################## SETUP #################### @@ -3110,7 +3110,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework", func() { - It(" c3gcp, managerappframeworkc3gcp, appframeworkgcp, c3_mgr_gcp_sanity: can deploy a C3 SVA with App Framework enabled and check isDeploymentInProgressFlag for CM and SHC CR's", func() { + It(" c3gcp, c3_mgr_gcp_sanity: can deploy a C3 SVA with App Framework enabled and check isDeploymentInProgressFlag for CM and SHC CR's", func() { /* Test Steps @@ -3236,7 +3236,7 @@ var _ = Describe("c3appfw test", func() { }) Context("Clustered deployment (C3 - clustered indexer, search head cluster)", func() { - It("integration, c3, managerappframeworkc3, appframework: can deploy a C3 SVA and have ES app installed on Search Head Cluster", func() { + It("integration, c3, appframework: can deploy a C3 SVA and have ES app installed on Search Head Cluster", func() { /* Test Steps ################## SETUP #################### diff --git a/test/appframework_gcp/m4/appframework_gcs_test.go b/test/appframework_gcp/m4/appframework_gcs_test.go index d5e2f16df..33edbe233 100644 --- a/test/appframework_gcp/m4/appframework_gcs_test.go +++ b/test/appframework_gcp/m4/appframework_gcs_test.go @@ -89,7 +89,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Multisite Indexer Cluster with Search Head Cluster (m4) with App Framework", func() { - It(" m4gcp, masterappframeworkm4gcp, appframeworkgcp, m4_gcp_sanity: can deploy a M4 SVA with App Framework enabled, install apps and upgrade them", func() { + It(" m4gcp, masterappframeworkm4gcp, m4_gcp_sanity: can deploy a M4 SVA with App Framework enabled, install apps and upgrade them", func() { /* Test Steps ################## SETUP ################## @@ -1717,7 +1717,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Single Site Indexer Cluster with Search Head Cluster (M4) and App Framework", func() { - It(" m4gcp, masterappframeworkm4gcp, appframeworkgcp, m4_gcp_sanity: can deploy a M4, add new apps to app source while install is in progress and have all apps installed cluster-wide", func() { + It(" m4gcp, masterappframeworkm4gcp, m4_gcp_sanity: can deploy a M4, add new apps to app source while install is in progress and have all apps installed cluster-wide", func() { /* Test Steps ################## SETUP #################### @@ -2636,7 +2636,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Multisite Indexer Cluster with Search Head Cluster (m4) with App Framework", func() { - It(" m4gcp, masterappframeworkm4gcp, appframeworkgcp, m4_gcp_sanity: can deploy a M4 SVA with App Framework enabled, install apps and check IsDeploymentInProgress for CM and SHC CR's", func() { + It(" m4gcp, masterappframeworkm4gcp, m4_gcp_sanity: can deploy a M4 SVA with App Framework enabled, install apps and check IsDeploymentInProgress for CM and SHC CR's", func() { /* Test Steps ################## SETUP ################## diff --git a/test/appframework_gcp/m4/manager_appframework_test.go b/test/appframework_gcp/m4/manager_appframework_test.go index c7166e907..971c3f513 100644 --- a/test/appframework_gcp/m4/manager_appframework_test.go +++ b/test/appframework_gcp/m4/manager_appframework_test.go @@ -88,7 +88,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Multisite Indexer Cluster with Search Head Cluster (m4) with App Framework", func() { - It(" m4gcp, managerappframeworkm4gcp, appframeworkgcp, m4_mgr_gcp_sanity: can deploy a M4 SVA with App Framework enabled, install apps and upgrade them", func() { + It(" m4gcp, m4_mgr_gcp_sanity: can deploy a M4 SVA with App Framework enabled, install apps and upgrade them", func() { /* Test Steps ################## SETUP ################## @@ -306,7 +306,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Multisite Indexer Cluster with Search Head Cluster (m4) with App Framework", func() { - It("integration, m4, managerappframeworkm4, appframework: can deploy a M4 SVA with App Framework enabled, install apps and downgrade them", func() { + It("integration, m4, appframework: can deploy a M4 SVA with App Framework enabled, install apps and downgrade them", func() { /* Test Steps ################## SETUP ################## @@ -504,7 +504,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Multisite Indexer Cluster with Search Head Cluster (m4) with App Framework", func() { - It("integration, m4, managerappframeworkm4, appframework: can deploy a M4 SVA with App Framework enabled, install apps, scale up clusters, install apps on new pods, scale down", func() { + It("integration, m4, appframework: can deploy a M4 SVA with App Framework enabled, install apps, scale up clusters, install apps on new pods, scale down", func() { /* Test Steps ################## SETUP ################## @@ -783,7 +783,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Multi Site Indexer Cluster with Search Head Cluster (m4) with App Framework", func() { - It("integration, m4, managerappframeworkm4, appframework: can deploy a M4 SVA and have apps installed locally on Cluster Manager and Deployer", func() { + It("integration, m4, appframework: can deploy a M4 SVA and have apps installed locally on Cluster Manager and Deployer", func() { /* Test Steps ################## SETUP #################### @@ -916,7 +916,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Multi Site Indexer Cluster with Search Head Cluster (m4) with App Framework", func() { - It("integration, m4, managerappframeworkm4, appframework: can deploy a M4 SVA with App Framework enabled for manual poll", func() { + It("integration, m4, appframework: can deploy a M4 SVA with App Framework enabled for manual poll", func() { /* Test Steps ################## SETUP #################### * Upload V1 apps to GCP for Monitoring Console @@ -1170,7 +1170,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Multi Site Indexer Cluster with Search Head Cluster (m4) with App Framework", func() { - It("integration, m4, managerappframeworkm4, appframework: can deploy a M4 SVA and have apps installed and updated locally on Cluster Manager and Deployer via manual poll", func() { + It("integration, m4, appframework: can deploy a M4 SVA and have apps installed and updated locally on Cluster Manager and Deployer via manual poll", func() { /* Test Steps ################## SETUP #################### @@ -1353,7 +1353,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Multi Site Indexer Cluster with Search Head Cluster (m4) with App Framework", func() { - It("m4, integration, managerappframeworkm4, appframework: can deploy a m4 SVA with apps installed locally on Cluster Manager and Deployer, cluster-wide on Peers and Search Heads, then upgrade them via a manual poll", func() { + It("m4, integration, appframework: can deploy a m4 SVA with apps installed locally on Cluster Manager and Deployer, cluster-wide on Peers and Search Heads, then upgrade them via a manual poll", func() { /* Test Steps ################## SETUP #################### @@ -1584,7 +1584,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Multisite Indexer Cluster with Search Head Cluster (M4) and App Framework", func() { - It("integration, m4, managerappframeworkm4, appframework: can deploy a M4, add new apps to app source while install is in progress and have all apps installed locally on Cluster Manager and Deployer", func() { + It("integration, m4, appframework: can deploy a M4, add new apps to app source while install is in progress and have all apps installed locally on Cluster Manager and Deployer", func() { /* Test Steps ################## SETUP #################### @@ -1716,7 +1716,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Single Site Indexer Cluster with Search Head Cluster (M4) and App Framework", func() { - It(" m4gcp, managerappframeworkm4gcp, appframeworkgcp, m4_mgr_gcp_sanity: can deploy a M4, add new apps to app source while install is in progress and have all apps installed cluster-wide", func() { + It(" m4gcp, m4_mgr_gcp_sanity: can deploy a M4, add new apps to app source while install is in progress and have all apps installed cluster-wide", func() { /* Test Steps ################## SETUP #################### @@ -1853,7 +1853,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Multisite Indexer Cluster with Search Head Cluster (m4) with App Framework", func() { - It("integration, m4, managerappframeworkm4, appframework: can deploy a M4 SVA with App Framework enabled and reset operator pod while app install is in progress", func() { + It("integration, m4, appframework: can deploy a M4 SVA with App Framework enabled and reset operator pod while app install is in progress", func() { /* Test Steps ################## SETUP ################## @@ -1945,7 +1945,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Multisite Indexer Cluster with Search Head Cluster (m4) with App Framework", func() { - It("integration, m4, managerappframeworkm4, appframework: can deploy a M4 SVA with App Framework enabled and reset operator pod while app download is in progress", func() { + It("integration, m4, appframework: can deploy a M4 SVA with App Framework enabled and reset operator pod while app download is in progress", func() { /* Test Steps ################## SETUP ################## @@ -2037,7 +2037,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Multisite Indexer Cluster with Search Head Cluster (m4) with App Framework", func() { - It("integration, m4, managerappframeworkm4, appframework: can deploy a M4 SVA with App Framework enabled, install an app, then disable it by using a disabled version of the app and then remove it from app source", func() { + It("integration, m4, appframework: can deploy a M4 SVA with App Framework enabled, install an app, then disable it by using a disabled version of the app and then remove it from app source", func() { /* Test Steps ################## SETUP ################## @@ -2148,7 +2148,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Multi Site Indexer Cluster with Search Head Cluster (M4) with App Framework", func() { - It("integration, m4, managerappframeworkm4, appframework: can deploy a M4 SVA, install apps via manual polling, switch to periodic polling, verify apps are not updated before the end of AppsRepoPollInterval, then updated after", func() { + It("integration, m4, appframework: can deploy a M4 SVA, install apps via manual polling, switch to periodic polling, verify apps are not updated before the end of AppsRepoPollInterval, then updated after", func() { /* Test Steps ################## SETUP #################### @@ -2329,7 +2329,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Multisite Indexer Cluster with Search Head Cluster (m4) with App Framework", func() { - It("integration, m4, managerappframeworkm4, appframework: can deploy a M4 SVA with App Framework enabled and update apps after app download is completed", func() { + It("integration, m4, appframework: can deploy a M4 SVA with App Framework enabled and update apps after app download is completed", func() { /* Test Steps ################## SETUP ################## @@ -2448,7 +2448,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Multisite Indexer Cluster with Search Head Cluster (m4) with App Framework", func() { - It("m4, integration, managerappframeworkm4, appframework: can deploy a M4 SVA and install a bigger volume of apps than the operator PV disk space", func() { + It("m4, integration, appframework: can deploy a M4 SVA and install a bigger volume of apps than the operator PV disk space", func() { /* Test Steps ################## SETUP #################### @@ -2540,7 +2540,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Multisite Indexer Cluster with Search Head Cluster (m4) with App Framework", func() { - It("integration, m4, managerappframeworkm4, appframework: can deploy a M4 SVA with App Framework enabled and delete apps from app directory when download is complete", func() { + It("integration, m4, appframework: can deploy a M4 SVA with App Framework enabled and delete apps from app directory when download is complete", func() { /* Test Steps ################## SETUP ################## @@ -2635,7 +2635,7 @@ var _ = Describe("m4appfw test", func() { }) Context("Multisite Indexer Cluster with Search Head Cluster (m4) with App Framework", func() { - It(" m4gcp, managerappframeworkm4gcp, appframeworkgcp, m4_mgr_gcp_sanity: can deploy a M4 SVA with App Framework enabled, install apps and check IsDeploymentInProgress for CM and SHC CR's", func() { + It(" m4gcp, m4_mgr_gcp_sanity: can deploy a M4 SVA with App Framework enabled, install apps and check IsDeploymentInProgress for CM and SHC CR's", func() { /* Test Steps ################## SETUP ################## diff --git a/test/appframework_gcp/s1/appframework_gcs_test.go b/test/appframework_gcp/s1/appframework_gcs_test.go index 6bd3ad11c..a36559db9 100644 --- a/test/appframework_gcp/s1/appframework_gcs_test.go +++ b/test/appframework_gcp/s1/appframework_gcs_test.go @@ -79,7 +79,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("smokegcp, s1gcp, appframeworks1gcp, appframeworkgcp, s1_gcp_sanity: can deploy a Standalone instance with App Framework enabled, install apps then upgrade them", func() { + It("smokegcp, s1gcp, s1_gcp_sanity: can deploy a Standalone instance with App Framework enabled, install apps then upgrade them", func() { /* Test Steps ################## SETUP #################### @@ -250,7 +250,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("smokegcp, s1gcp, appframeworks1gcp, appframeworkgcp, s1_gcp_sanity: can deploy a Standalone instance with App Framework enabled, install apps then downgrade them", func() { + It("smokegcp, s1gcp, s1_gcp_sanity: can deploy a Standalone instance with App Framework enabled, install apps then downgrade them", func() { /* Test Steps ################## SETUP #################### @@ -413,7 +413,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("s1gcp, smokegcp, appframeworks1gcp, appframeworkgcp: can deploy a Standalone instance with App Framework enabled, install apps, scale up, install apps on new pod, scale down", func() { + It("s1gcp, smokegcp, appframeworkgcp: can deploy a Standalone instance with App Framework enabled, install apps, scale up, install apps on new pod, scale down", func() { /* Test Steps ################## SETUP #################### @@ -608,7 +608,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("s1gcp, integrationgcp, appframeworks1gcp, appframeworkgcp: can deploy a Standalone instance with App Framework enabled, install apps, scale up, upgrade apps", func() { + It("s1gcp, integrationgcp, appframeworkgcp: can deploy a Standalone instance with App Framework enabled, install apps, scale up, upgrade apps", func() { /* Test Steps ################## SETUP #################### @@ -742,7 +742,7 @@ var _ = Describe("s1appfw test", func() { // ES App Installation not supported at the time. Will be added back at a later time. Context("Standalone deployment (S1) with App Framework", func() { - It("s1gcp, integrationgcp, appframeworks1gcp, appframeworkgcp: can deploy a Standalone and have ES app installed", func() { + It("s1gcp, integrationgcp, appframeworkgcp: can deploy a Standalone and have ES app installed", func() { /* Test Steps ################## SETUP #################### @@ -843,7 +843,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integrationgcp, s1gcp, appframeworks1gcp, appframeworkgcp: can deploy a Standalone instance with App Framework enabled and install around 350MB of apps at once", func() { + It("integrationgcp, s1gcp, appframeworkgcp: can deploy a Standalone instance with App Framework enabled and install around 350MB of apps at once", func() { /* Test Steps ################## SETUP #################### @@ -912,7 +912,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("s1gcp, smokegcp, appframeworks1gcp, appframeworkgcp: can deploy a standalone instance with App Framework enabled for manual poll", func() { + It("s1gcp, smokegcp, appframeworkgcp: can deploy a standalone instance with App Framework enabled for manual poll", func() { /* Test Steps ################## SETUP #################### @@ -1090,7 +1090,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integrationgcp, s1gcp, appframeworks1gcp, appframeworkgcp: can deploy Several standalone CRs in the same namespace with App Framework enabled", func() { + It("integrationgcp, s1gcp, appframeworkgcp: can deploy Several standalone CRs in the same namespace with App Framework enabled", func() { /* Test Steps ################## SETUP #################### @@ -1191,7 +1191,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integrationgcp, s1gcp, appframeworks1gcp, appframeworkgcp: can add new apps to app source while install is in progress and have all apps installed", func() { + It("integrationgcp, s1gcp, appframeworkgcp: can add new apps to app source while install is in progress and have all apps installed", func() { /* Test Steps ################## SETUP #################### @@ -1303,7 +1303,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integrationgcp, s1gcp, appframeworks1gcp, appframeworkgcp: Deploy a Standalone instance with App Framework enabled and reset operator pod while app install is in progress", func() { + It("integrationgcp, s1gcp, appframeworkgcp: Deploy a Standalone instance with App Framework enabled and reset operator pod while app install is in progress", func() { /* Test Steps ################## SETUP #################### @@ -1399,7 +1399,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integrationgcp, s1gcp, appframeworks1gcp, appframeworkgcp: Deploy a Standalone instance with App Framework enabled and reset operator pod while app download is in progress", func() { + It("integrationgcp, s1gcp, appframeworkgcp: Deploy a Standalone instance with App Framework enabled and reset operator pod while app download is in progress", func() { /* Test Steps ################## SETUP #################### @@ -1467,7 +1467,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integrationgcp, s1gcp, appframeworks1gcp, appframeworkgcp: can deploy a Standalone instance with App Framework enabled, install an app then disable it and remove it from app source", func() { + It("integrationgcp, s1gcp, appframeworkgcp: can deploy a Standalone instance with App Framework enabled, install an app then disable it and remove it from app source", func() { /* Test Steps ################## SETUP #################### @@ -1561,7 +1561,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integrationgcp, s1gcp, appframeworks1gcp, appframeworkgcp: can deploy a Standalone instance with App Framework enabled, attempt to update using incorrect GCS credentials", func() { + It("integrationgcp, s1gcp, appframeworkgcp: can deploy a Standalone instance with App Framework enabled, attempt to update using incorrect GCS credentials", func() { /* Test Steps ################## SETUP #################### @@ -1698,7 +1698,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integrationgcp, s1gcp, appframeworks1gcp, appframeworkgcp: Deploy a Standalone instance with App Framework enabled and update apps after app download is completed", func() { + It("integrationgcp, s1gcp, appframeworkgcp: Deploy a Standalone instance with App Framework enabled and update apps after app download is completed", func() { /* Test Steps ################## SETUP #################### @@ -1782,7 +1782,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integrationgcp, s1gcp, appframeworks1gcp, appframeworkgcp: can deploy a Standalone instance and install a bigger volume of apps than the operator PV disk space", func() { + It("integrationgcp, s1gcp, appframeworkgcp: can deploy a Standalone instance and install a bigger volume of apps than the operator PV disk space", func() { /* Test Steps ################## SETUP #################### @@ -1857,7 +1857,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integrationgcp, s1gcp, appframeworks1gcp, appframeworkgcp: Deploy a Standalone instance with App Framework enabled and delete apps from app directory when app download is complete", func() { + It("integrationgcp, s1gcp, appframeworkgcp: Deploy a Standalone instance with App Framework enabled and delete apps from app directory when app download is complete", func() { /* Test Steps ################## SETUP #################### @@ -1928,7 +1928,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("smokegcp, s1gcp, appframeworks1gcp, appframeworkgcp, s1_gcp_sanity: can deploy a Standalone instance with App Framework enabled, install apps and check isDeploymentInProgress is set for Standaloen and MC CR's", func() { + It("smokegcp, s1gcp, s1_gcp_sanity: can deploy a Standalone instance with App Framework enabled, install apps and check isDeploymentInProgress is set for Standaloen and MC CR's", func() { /* Test Steps ################## SETUP #################### diff --git a/test/monitoring_console/manager_monitoring_console_test.go b/test/monitoring_console/manager_monitoring_console_test.go index a783996d5..2796f77a3 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 @@ -755,7 +755,7 @@ var _ = Describe("Monitoring Console test", func() { Expect(err).To(Succeed(), "Failed to get update Monitoring Console in Search Head Cluster CRD") // Ensure Search Head Cluster go to Ready Phase - testenv.SearchHeadClusterReady(ctx, deployment, testcaseEnvInst) + //testenv.SearchHeadClusterReady(ctx, deployment, testcaseEnvInst) // Verify MC is Ready and stays in ready state // testenv.VerifyMonitoringConsoleReady(ctx, deployment, mcTwoName, mcTwo, testcaseEnvInst) @@ -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") })