CM ref + LM,CM,MC,IDX

splunk · Aug 3, 2023 · 2bc3bfd · 2bc3bfd
1 parent 937e824
commit 2bc3bfd
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/test/appframework_aws/c3/manager_appframework_test.go b/test/appframework_aws/c3/manager_appframework_test.go
@@ -402,10 +402,10 @@ var _ = Describe("c3appfw test", func() {
 			mc, err := deployment.DeployMonitoringConsoleWithGivenSpec(ctx, testcaseEnvInst.GetName(), mcName, mcSpec)
 			Expect(err).To(Succeed(), "Unable to deploy Monitoring Console")
 
-			shcName := fmt.Sprintf("%s-shc", deployment.GetName())
-			// idxName := fmt.Sprintf("%s-idxc", deployment.GetName())
-			shc, err := deployment.DeploySearchHeadCluster(ctx, shcName, cm.GetName(), lm.GetName(), "", mcName)
-			// idxc, err := deployment.DeployIndexerCluster(ctx, idxName, lm.GetName(), 3, cm.GetName(), "")
+			// shcName := fmt.Sprintf("%s-shc", deployment.GetName())
+			idxName := fmt.Sprintf("%s-idxc", deployment.GetName())
+			// shc, err := deployment.DeploySearchHeadCluster(ctx, shcName, cm.GetName(), lm.GetName(), "", mcName)
+			idxc, err := deployment.DeployIndexerCluster(ctx, idxName, lm.GetName(), 3, cm.GetName(), "")
 			// Expect(err).To(Succeed(), "Unable to deploy Single Site Indexer Cluster with Search Head Cluster")
 
 			// Wait for License Manager to be in READY phase
@@ -418,10 +418,10 @@ var _ = Describe("c3appfw test", func() {
 			testenv.VerifyMonitoringConsoleReady(ctx, deployment, deployment.GetName(), mc, testcaseEnvInst)
 
 			// // Ensure Search Head Cluster go to Ready phase
-			testenv.SearchHeadClusterReady(ctx, deployment, testcaseEnvInst)
+			// testenv.SearchHeadClusterReady(ctx, deployment, testcaseEnvInst)
 
 			// Ensure Indexers go to Ready phase
-			// testenv.SingleSiteIndexersReady(ctx, deployment, testcaseEnvInst)
+			testenv.SingleSiteIndexersReady(ctx, deployment, testcaseEnvInst)
 
 			// // Verify RF SF is met
 			// testenv.VerifyRFSFMet(ctx, deployment, testcaseEnvInst)
@@ -488,17 +488,17 @@ var _ = Describe("c3appfw test", func() {
 
 			// // Update SHC image
 
-			testcaseEnvInst.Log.Info("Upgrading the Search Head Cluster Image", "Current Image", oldImage, "New Image", newImage)
-			shc.Spec.Image = newImage
-			err = deployment.UpdateCR(ctx, shc)
-			Expect(err).To(Succeed(), "Failed upgrade Search Head Cluster image")
+			// testcaseEnvInst.Log.Info("Upgrading the Search Head Cluster Image", "Current Image", oldImage, "New Image", newImage)
+			// shc.Spec.Image = newImage
+			// err = deployment.UpdateCR(ctx, shc)
+			// Expect(err).To(Succeed(), "Failed upgrade Search Head Cluster image")
 
 			// // Update IDXC image
 
-			// testcaseEnvInst.Log.Info("Upgrading the Indexer Cluster Image", "Current Image", oldImage, "New Image", newImage)
-			// idxc.Spec.Image = newImage
-			// err = deployment.UpdateCR(ctx, idxc)
-			// Expect(err).To(Succeed(), "Failed upgrade Indexer Cluster image")
+			testcaseEnvInst.Log.Info("Upgrading the Indexer Cluster Image", "Current Image", oldImage, "New Image", newImage)
+			idxc.Spec.Image = newImage
+			err = deployment.UpdateCR(ctx, idxc)
+			Expect(err).To(Succeed(), "Failed upgrade Indexer Cluster image")
 
 			// Ensure Cluster Manager goes to Ready phase
 			testenv.ClusterManagerReady(ctx, deployment, testcaseEnvInst)
@@ -510,10 +510,10 @@ var _ = Describe("c3appfw test", func() {
 			testenv.VerifyMonitoringConsoleReady(ctx, deployment, deployment.GetName(), mc, testcaseEnvInst)
 
 			// // Ensure Search Head Cluster go to Ready phase
-			testenv.SearchHeadClusterReady(ctx, deployment, testcaseEnvInst)
+			// testenv.SearchHeadClusterReady(ctx, deployment, testcaseEnvInst)
 
 			// // Ensure Indexers go to Ready phase
-			// testenv.SingleSiteIndexersReady(ctx, deployment, testcaseEnvInst)
+			testenv.SingleSiteIndexersReady(ctx, deployment, testcaseEnvInst)
 
 			//############### UPGRADE APPS ################
 			// Delete apps on S3