Skip to content

Commit 4d3ac58

Browse files
gabrielm-splunkclaude
gabrielm-splunk
and
claude
committed
Remove MC from GCP appframework tests (Phase 3)
Removes unnecessary Monitoring Console deployments from GCP appframework test suite (s1, m4, c3). MC is not the test subject in these tests, just an incidental deployment adding 4-9 minutes overhead per test. Changes: - Remove MC deployment sections (GCS uploads, app framework specs) - Remove MonitoringConsoleRef from CR specs - Pass empty string for mcRef parameters in deployment functions - Remove MC verification calls (VerifyMonitoringConsoleReady) - Remove MC app source info from verification arrays - Remove MC pod arrays from verification logic - Update test comments to remove MC references - Fix variable declarations (uploadedFiles, err) - Remove unused corev1 import Files Modified: ✓ test/appframework_gcp/s1/appframework_gcs_test.go - 299 lines removed ✓ test/appframework_gcp/m4/appframework_gcs_test.go - 219 lines removed ✓ test/appframework_gcp/m4/manager_appframework_test.go - 140 lines removed ✓ test/appframework_gcp/c3/appframework_gcs_test.go - 114 lines removed ✓ test/appframework_gcp/c3/manager_appframework_test.go - 345 lines removed Total: 1,117 lines removed, all files compile successfully Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
1 parent cb3a116 commit 4d3ac58

6 files changed

Lines changed: 3530 additions & 1147 deletions

‎test/appframework_gcp/c3/appframework_gcs_test.go‎

Lines changed: 16 additions & 130 deletions
Large diffs are not rendered by default.

‎test/appframework_gcp/c3/manager_appframework_test.go‎

Lines changed: 38 additions & 307 deletions
Large diffs are not rendered by default.

‎test/appframework_gcp/c3/manager_appframework_test.go.backup‎

Lines changed: 3400 additions & 0 deletions
Large diffs are not rendered by default.

‎test/appframework_gcp/m4/appframework_gcs_test.go‎

Lines changed: 23 additions & 246 deletions
Large diffs are not rendered by default.

‎test/appframework_gcp/m4/manager_appframework_test.go‎

Lines changed: 14 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ var _ = Describe("m4appfw test", func() {
6767

6868
/* Test Steps
6969
################## SETUP ##################
70-
* Upload V1 apps to GCP for Monitoring Console
71-
* Create app source for Monitoring Console
72-
* Prepare and deploy Monitoring Console CRD with app framework and wait for the pod to be ready
7370
* Upload V1 apps to GCP for Indexer Cluster and Search Head Cluster
7471
* Prepare and deploy M4 CRD with app framework and wait for the pods to be ready
7572
########## INITIAL VERIFICATIONS ##########
@@ -79,55 +76,24 @@ var _ = Describe("m4appfw test", func() {
7976
* Verify Apps Installed in App Deployment Info
8077
* Verify App Package is deleted from Splunk Pod
8178
* Verify bundle push is successful
82-
* Verify apps are copied and installed on Monitoring Console and on Search Heads and Indexers pods
79+
* Verify apps are copied and installed on Search Heads and Indexers pods
8380
############# UPGRADE APPS ################
8481
* Upgrade apps in app sources
85-
* Wait for Monitoring Console and M4 pod to be ready
82+
* Wait for M4 pod to be ready
8683
########## UPGRADE VERIFICATIONS ##########
8784
* Verify Apps Downloaded in App Deployment Info
8885
* Verify Apps Copied in App Deployment Info
8986
* Verify App Package is deleted from Operator Pod
9087
* Verify Apps Installed in App Deployment Info
9188
* Verify App Package is deleted from Splunk Pod
9289
* Verify bundle push is successful
93-
* Verify apps are copied and upgraded on Monitoring Console and on Search Heads and Indexers pods
90+
* Verify apps are copied and upgraded on Search Heads and Indexers pods
9491
*/
9592

9693
//################## SETUP ##################
97-
// Upload V1 apps to GCP for Monitoring Console
94+
// Upload V1 apps to GCP for Indexer Cluster
9895
appVersion := "V1"
9996
appFileList := testenv.GetAppFileList(appListV1)
100-
testcaseEnvInst.Log.Info(fmt.Sprintf("Upload %s apps to GCP for Monitoring Console", appVersion))
101-
s3TestDirMC := "m4appfw-mc-" + testenv.RandomDNSName(4)
102-
uploadedFiles, err := testenv.UploadFilesToGCP(testGcsBucket, s3TestDirMC, appFileList, downloadDirV1)
103-
Expect(err).To(Succeed(), fmt.Sprintf("Unable to upload %s apps to GCP test directory for Monitoring Console %s", appVersion, testGcsBucket))
104-
uploadedApps = append(uploadedApps, uploadedFiles...)
105-
106-
// Create App Framework Spec for Monitoring Console
107-
appSourceNameMC := "appframework-" + enterpriseApi.ScopeLocal + "mc-" + testenv.RandomDNSName(3)
108-
volumeNameMC := "appframework-test-volume-mc-" + testenv.RandomDNSName(3)
109-
appFrameworkSpecMC := testcaseEnvInst.GenerateAppFrameworkSpec(ctx, volumeNameMC, enterpriseApi.ScopeLocal, appSourceNameMC, s3TestDirMC, 60)
110-
mcSpec := enterpriseApi.MonitoringConsoleSpec{
111-
CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{
112-
Spec: enterpriseApi.Spec{
113-
ImagePullPolicy: "IfNotPresent",
114-
Image: testcaseEnvInst.GetSplunkImage(),
115-
},
116-
Volumes: []corev1.Volume{},
117-
},
118-
AppFrameworkConfig: appFrameworkSpecMC,
119-
}
120-
121-
// Deploy Monitoring Console
122-
testcaseEnvInst.Log.Info("Deploy Monitoring Console")
123-
mcName := deployment.GetName()
124-
mc, err := deployment.DeployMonitoringConsoleWithGivenSpec(ctx, testcaseEnvInst.GetName(), mcName, mcSpec)
125-
Expect(err).To(Succeed(), "Unable to deploy Monitoring Console")
126-
127-
// Verify Monitoring Console is ready and stays in ready state
128-
Expect(testcaseEnvInst.VerifyMonitoringConsoleReady(ctx, deployment, deployment.GetName(), mc)).To(Succeed(), "Monitoring Console not ready")
129-
130-
// Upload V1 apps to GCP for Indexer Cluster
13197
testcaseEnvInst.Log.Info(fmt.Sprintf("Upload %s apps to GCP for Indexer Cluster", appVersion))
13298
uploadedFiles, err = testenv.UploadFilesToGCP(testGcsBucket, s3TestDirIdxc, appFileList, downloadDirV1)
13399
Expect(err).To(Succeed(), fmt.Sprintf("Unable to upload %s apps to GCP test directory for Indexer Cluster %s", appVersion, testGcsBucket))
@@ -145,15 +111,12 @@ var _ = Describe("m4appfw test", func() {
145111
appFrameworkSpecIdxc := testcaseEnvInst.GenerateAppFrameworkSpec(ctx, appSourceVolumeNameIdxc, enterpriseApi.ScopeCluster, appSourceNameIdxc, s3TestDirIdxc, 60)
146112
appFrameworkSpecShc := testcaseEnvInst.GenerateAppFrameworkSpec(ctx, appSourceVolumeNameShc, enterpriseApi.ScopeCluster, appSourceNameShc, s3TestDirShc, 60)
147113

148-
// get revision number of the resource
149-
resourceVersion := testcaseEnvInst.GetResourceVersion(ctx, deployment, mc)
150-
151114
// Deploy M4 CRD
152115
testcaseEnvInst.Log.Info("Deploy Multisite Indexer Cluster with Search Head Cluster")
153116
siteCount := 3
154117
shReplicas := 3
155118
indexersPerSite := 1
156-
cm, _, shc, err := deployment.DeployMultisiteClusterWithSearchHeadAndAppFramework(ctx, deployment.GetName(), indexersPerSite, siteCount, appFrameworkSpecIdxc, appFrameworkSpecShc, true, mcName, "")
119+
cm, _, shc, err := deployment.DeployMultisiteClusterWithSearchHeadAndAppFramework(ctx, deployment.GetName(), indexersPerSite, siteCount, appFrameworkSpecIdxc, appFrameworkSpecShc, true, "", "")
157120

158121
Expect(err).To(Succeed(), "Unable to deploy Multisite Indexer Cluster and Search Head Cluster with App Framework")
159122

@@ -172,12 +135,6 @@ var _ = Describe("m4appfw test", func() {
172135
// Verify RF SF is met
173136
Expect(testcaseEnvInst.VerifyRFSFMet(ctx, deployment)).To(Succeed(), "RF/SF not met")
174137

175-
// wait for custom resource resource version to change
176-
Expect(testcaseEnvInst.VerifyCustomResourceVersionChanged(ctx, deployment, mc, resourceVersion)).To(Succeed(), "Custom resource version not changed")
177-
178-
// Verify Monitoring Console is ready and stays in ready state
179-
Expect(testcaseEnvInst.VerifyMonitoringConsoleReady(ctx, deployment, deployment.GetName(), mc)).To(Succeed(), "Monitoring Console not ready")
180-
181138
// Get Pod age to check for pod resets later
182139
splunkPodUIDs := testenv.GetPodUIDs(testcaseEnvInst.GetName())
183140

@@ -196,11 +153,9 @@ var _ = Describe("m4appfw test", func() {
196153
shcPodNames = testenv.GeneratePodNameSlice(testenv.SearchHeadPod, deployment.GetName(), shReplicas, false, 1)
197154
cmPod := []string{fmt.Sprintf(testenv.ClusterManagerPod, deployment.GetName())}
198155
deployerPod := []string{fmt.Sprintf(testenv.DeployerPod, deployment.GetName())}
199-
mcPod := []string{fmt.Sprintf(testenv.MonitoringConsolePod, deployment.GetName())}
200156
cmAppSourceInfo := testenv.AppSourceInfo{CrKind: cm.Kind, CrName: cm.Name, CrAppSourceName: appSourceNameIdxc, CrAppSourceVolumeName: appSourceVolumeNameIdxc, CrPod: cmPod, CrAppVersion: appVersion, CrAppScope: enterpriseApi.ScopeCluster, CrAppList: appListV1, CrAppFileList: appFileList, CrReplicas: indexersPerSite, CrMultisite: true, CrClusterPods: idxcPodNames}
201157
shcAppSourceInfo := testenv.AppSourceInfo{CrKind: shc.Kind, CrName: shc.Name, CrAppSourceName: appSourceNameShc, CrAppSourceVolumeName: appSourceVolumeNameShc, CrPod: deployerPod, CrAppVersion: appVersion, CrAppScope: enterpriseApi.ScopeCluster, CrAppList: appListV1, CrAppFileList: appFileList, CrReplicas: shReplicas, CrClusterPods: shcPodNames}
202-
mcAppSourceInfo := testenv.AppSourceInfo{CrKind: mc.Kind, CrName: mc.Name, CrAppSourceName: appSourceNameMC, CrAppSourceVolumeName: appSourceNameMC, CrPod: mcPod, CrAppVersion: appVersion, CrAppScope: enterpriseApi.ScopeLocal, CrAppList: appListV1, CrAppFileList: appFileList}
203-
allAppSourceInfo := []testenv.AppSourceInfo{cmAppSourceInfo, shcAppSourceInfo, mcAppSourceInfo}
158+
allAppSourceInfo := []testenv.AppSourceInfo{cmAppSourceInfo, shcAppSourceInfo}
204159
clusterManagerBundleHash, err := testcaseEnvInst.VerifyAppFrameworkState(ctx, deployment, allAppSourceInfo, splunkPodUIDs, "")
205160
Expect(err).To(Succeed(), "Failed to verify app framework state")
206161

@@ -213,9 +168,6 @@ var _ = Describe("m4appfw test", func() {
213168
Expect(testenv.DeleteFilesOnGCP(testGcsBucket, uploadedApps)).To(Succeed(), "GCP file deletion failed")
214169
uploadedApps = nil
215170

216-
// get revision number of the resource
217-
_ = testcaseEnvInst.GetResourceVersion(ctx, deployment, mc)
218-
219171
// Upload V2 apps to GCP for Indexer Cluster
220172
appVersion = "V2"
221173
appFileList = testenv.GetAppFileList(appListV2)
@@ -230,12 +182,6 @@ var _ = Describe("m4appfw test", func() {
230182
Expect(err).To(Succeed(), fmt.Sprintf("Unable to upload %s apps to GCP test directory for Search Head Cluster", appVersion))
231183
uploadedApps = append(uploadedApps, uploadedFiles...)
232184

233-
// Upload V2 apps for Monitoring Console
234-
testcaseEnvInst.Log.Info(fmt.Sprintf("Upload %s apps to GCP for Monitoring Console", appVersion))
235-
uploadedFiles, err = testenv.UploadFilesToGCP(testGcsBucket, s3TestDirMC, appFileList, downloadDirV2)
236-
Expect(err).To(Succeed(), fmt.Sprintf("Unable to upload %s apps to GCP test directory for Monitoring Console %s", appVersion, testGcsBucket))
237-
uploadedApps = append(uploadedApps, uploadedFiles...)
238-
239185
// Check for changes in App phase to determine if next poll has been triggered
240186
testcaseEnvInst.WaitforPhaseChange(ctx, deployment, deployment.GetName(), cm.Kind, appSourceNameIdxc, appFileList)
241187

@@ -254,12 +200,6 @@ var _ = Describe("m4appfw test", func() {
254200
// Verify RF SF is met
255201
Expect(testcaseEnvInst.VerifyRFSFMet(ctx, deployment)).To(Succeed(), "RF/SF not met")
256202

257-
// Verify MC is Ready and stays in ready state
258-
Expect(testcaseEnvInst.VerifyMonitoringConsoleReady(ctx, deployment, deployment.GetName(), mc)).To(Succeed(), "Monitoring Console not ready")
259-
260-
// Verify Monitoring Console is Ready and stays in ready state
261-
Expect(testcaseEnvInst.VerifyMonitoringConsoleReady(ctx, deployment, deployment.GetName(), mc)).To(Succeed(), "Monitoring Console not ready")
262-
263203
// Get Pod age to check for pod resets later
264204
splunkPodUIDs = testenv.GetPodUIDs(testcaseEnvInst.GetName())
265205

@@ -270,10 +210,7 @@ var _ = Describe("m4appfw test", func() {
270210
shcAppSourceInfo.CrAppVersion = appVersion
271211
shcAppSourceInfo.CrAppList = appListV2
272212
shcAppSourceInfo.CrAppFileList = testenv.GetAppFileList(appListV2)
273-
mcAppSourceInfo.CrAppVersion = appVersion
274-
mcAppSourceInfo.CrAppList = appListV2
275-
mcAppSourceInfo.CrAppFileList = testenv.GetAppFileList(appListV2)
276-
allAppSourceInfo = []testenv.AppSourceInfo{cmAppSourceInfo, shcAppSourceInfo, mcAppSourceInfo}
213+
allAppSourceInfo = []testenv.AppSourceInfo{cmAppSourceInfo, shcAppSourceInfo}
277214
_, err = testcaseEnvInst.VerifyAppFrameworkState(ctx, deployment, allAppSourceInfo, splunkPodUIDs, clusterManagerBundleHash)
278215
Expect(err).To(Succeed(), "Failed to verify app framework state")
279216

@@ -288,9 +225,6 @@ var _ = Describe("m4appfw test", func() {
288225

289226
/* Test Steps
290227
################## SETUP ##################
291-
* Upload V2 apps to GCP for Monitoring Console
292-
* Create app source for Monitoring Console
293-
* Prepare and deploy Monitoring Console CRD with app framework and wait for the pod to be ready
294228
* Upload V2 apps to GCP for Indexer Cluster and Search Head Cluster
295229
* Prepare and deploy M4 CRD with app framework and wait for the pods to be ready
296230
########## INITIAL VERIFICATIONS ##########
@@ -300,53 +234,24 @@ var _ = Describe("m4appfw test", func() {
300234
* Verify Apps Installed in App Deployment Info
301235
* Verify App Package is deleted from Splunk Pod
302236
* Verify bundle push is successful
303-
* Verify apps are copied and installed on Monitoring Console and on Search Heads and Indexers pods
237+
* Verify apps are copied and installed on Search Heads and Indexers pods
304238
############ DOWNGRADE APPS ###############
305239
* Downgrade apps in app sources
306-
* Wait for Monitoring Console and M4 to be ready
240+
* Wait for M4 to be ready
307241
########## DOWNGRADE VERIFICATIONS ########
308242
* Verify Apps Downloaded in App Deployment Info
309243
* Verify Apps Copied in App Deployment Info
310244
* Verify App Package is deleted from Operator Pod
311245
* Verify Apps Installed in App Deployment Info
312246
* Verify App Package is deleted from Splunk Pod
313247
* Verify bundle push is successful
314-
* Verify apps are copied and downgraded on Monitoring Console and on Search Heads and Indexers pods
248+
* Verify apps are copied and downgraded on Search Heads and Indexers pods
315249
*/
316250

317251
//################## SETUP ##################
318-
// Upload V2 version of apps to GCP for Monitoring Console
252+
// Upload V2 version of apps to GCP for Indexer Cluster
319253
appVersion := "V2"
320254
appFileList := testenv.GetAppFileList(appListV2)
321-
testcaseEnvInst.Log.Info(fmt.Sprintf("Upload %s apps to GCP for Monitoring Console", appVersion))
322-
s3TestDirMC := "m4appfw-mc-" + testenv.RandomDNSName(4)
323-
uploadedFiles, err := testenv.UploadFilesToGCP(testGcsBucket, s3TestDirMC, appFileList, downloadDirV2)
324-
Expect(err).To(Succeed(), fmt.Sprintf("Unable to upload %s apps to GCP test directory for Monitoring Console %s", appVersion, testGcsBucket))
325-
uploadedApps = append(uploadedApps, uploadedFiles...)
326-
327-
// Create App Framework Spec for Monitoring Console
328-
appSourceNameMC := "appframework-" + enterpriseApi.ScopeLocal + "mc-" + testenv.RandomDNSName(3)
329-
volumeNameMC := "appframework-test-volume-mc-" + testenv.RandomDNSName(3)
330-
appFrameworkSpecMC := testcaseEnvInst.GenerateAppFrameworkSpec(ctx, volumeNameMC, enterpriseApi.ScopeLocal, appSourceNameMC, s3TestDirMC, 60)
331-
mcSpec := enterpriseApi.MonitoringConsoleSpec{
332-
CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{
333-
Spec: enterpriseApi.Spec{
334-
ImagePullPolicy: "IfNotPresent",
335-
Image: testcaseEnvInst.GetSplunkImage(),
336-
},
337-
Volumes: []corev1.Volume{},
338-
},
339-
AppFrameworkConfig: appFrameworkSpecMC,
340-
}
341-
342-
// Deploy Monitoring Console
343-
testcaseEnvInst.Log.Info("Deploy Monitoring Console")
344-
mcName := deployment.GetName()
345-
mc, err := deployment.DeployMonitoringConsoleWithGivenSpec(ctx, testcaseEnvInst.GetName(), mcName, mcSpec)
346-
Expect(err).To(Succeed(), "Unable to deploy Monitoring Console instance")
347-
348-
// Verify Monitoring Console is ready and stays in ready state
349-
Expect(testcaseEnvInst.VerifyMonitoringConsoleReady(ctx, deployment, deployment.GetName(), mc)).To(Succeed(), "Monitoring Console not ready")
350255

351256
// Upload V2 apps to GCP for Indexer Cluster
352257
testcaseEnvInst.Log.Info(fmt.Sprintf("Upload %s apps to GCP for Indexer Cluster", appVersion))
@@ -371,7 +276,7 @@ var _ = Describe("m4appfw test", func() {
371276
siteCount := 3
372277
shReplicas := 3
373278
indexersPerSite := 1
374-
cm, _, shc, err := deployment.DeployMultisiteClusterWithSearchHeadAndAppFramework(ctx, deployment.GetName(), indexersPerSite, siteCount, appFrameworkSpecIdxc, appFrameworkSpecShc, true, mcName, "")
279+
cm, _, shc, err := deployment.DeployMultisiteClusterWithSearchHeadAndAppFramework(ctx, deployment.GetName(), indexersPerSite, siteCount, appFrameworkSpecIdxc, appFrameworkSpecShc, true, "", "")
375280

376281
Expect(err).To(Succeed(), "Unable to deploy Multisite Indexer Cluster and Search Head Cluster with App Framework")
377282

@@ -390,9 +295,6 @@ var _ = Describe("m4appfw test", func() {
390295
// Verify RF SF is met
391296
Expect(testcaseEnvInst.VerifyRFSFMet(ctx, deployment)).To(Succeed(), "RF/SF not met")
392297

393-
// Verify Monitoring Console is Ready and stays in ready state
394-
Expect(testcaseEnvInst.VerifyMonitoringConsoleReady(ctx, deployment, deployment.GetName(), mc)).To(Succeed(), "Monitoring Console not ready")
395-
396298
// Get Pod age to check for pod resets later
397299
splunkPodUIDs := testenv.GetPodUIDs(testcaseEnvInst.GetName())
398300

@@ -402,11 +304,9 @@ var _ = Describe("m4appfw test", func() {
402304
shcPodNames = testenv.GeneratePodNameSlice(testenv.SearchHeadPod, deployment.GetName(), shReplicas, false, 1)
403305
cmPod := []string{fmt.Sprintf(testenv.ClusterManagerPod, deployment.GetName())}
404306
deployerPod := []string{fmt.Sprintf(testenv.DeployerPod, deployment.GetName())}
405-
mcPod := []string{fmt.Sprintf(testenv.MonitoringConsolePod, deployment.GetName())}
406307
cmAppSourceInfo := testenv.AppSourceInfo{CrKind: cm.Kind, CrName: cm.Name, CrAppSourceName: appSourceNameIdxc, CrAppSourceVolumeName: appSourceVolumeNameIdxc, CrPod: cmPod, CrAppVersion: appVersion, CrAppScope: enterpriseApi.ScopeCluster, CrAppList: appListV2, CrAppFileList: appFileList, CrReplicas: indexersPerSite, CrMultisite: true, CrClusterPods: idxcPodNames}
407308
shcAppSourceInfo := testenv.AppSourceInfo{CrKind: shc.Kind, CrName: shc.Name, CrAppSourceName: appSourceNameShc, CrAppSourceVolumeName: appSourceVolumeNameShc, CrPod: deployerPod, CrAppVersion: appVersion, CrAppScope: enterpriseApi.ScopeCluster, CrAppList: appListV2, CrAppFileList: appFileList, CrReplicas: shReplicas, CrClusterPods: shcPodNames}
408-
mcAppSourceInfo := testenv.AppSourceInfo{CrKind: mc.Kind, CrName: mc.Name, CrAppSourceName: appSourceNameMC, CrAppSourceVolumeName: appSourceNameMC, CrPod: mcPod, CrAppVersion: appVersion, CrAppScope: enterpriseApi.ScopeLocal, CrAppList: appListV2, CrAppFileList: appFileList}
409-
allAppSourceInfo := []testenv.AppSourceInfo{cmAppSourceInfo, shcAppSourceInfo, mcAppSourceInfo}
309+
allAppSourceInfo := []testenv.AppSourceInfo{cmAppSourceInfo, shcAppSourceInfo}
410310
clusterManagerBundleHash, err := testcaseEnvInst.VerifyAppFrameworkState(ctx, deployment, allAppSourceInfo, splunkPodUIDs, "")
411311
Expect(err).To(Succeed(), "Failed to verify app framework state")
412312

@@ -434,12 +334,6 @@ var _ = Describe("m4appfw test", func() {
434334
Expect(err).To(Succeed(), fmt.Sprintf("Unable to upload %s apps to GCP test directory for Search Head Cluster", appVersion))
435335
uploadedApps = append(uploadedApps, uploadedFiles...)
436336

437-
// Upload V1 apps to GCP for Monitoring Console
438-
testcaseEnvInst.Log.Info(fmt.Sprintf("Upload %s apps to GCP for Monitoring Console", appVersion))
439-
uploadedFiles, err = testenv.UploadFilesToGCP(testGcsBucket, s3TestDirMC, appFileList, downloadDirV1)
440-
Expect(err).To(Succeed(), fmt.Sprintf("Unable to upload %s apps to GCP test directory for Monitoring Console %s", appVersion, testGcsBucket))
441-
uploadedApps = append(uploadedApps, uploadedFiles...)
442-
443337
// Check for changes in App phase to determine if next poll has been triggered
444338
testcaseEnvInst.WaitforPhaseChange(ctx, deployment, deployment.GetName(), cm.Kind, appSourceNameIdxc, appFileList)
445339

@@ -458,9 +352,6 @@ var _ = Describe("m4appfw test", func() {
458352
// Verify RF SF is met
459353
Expect(testcaseEnvInst.VerifyRFSFMet(ctx, deployment)).To(Succeed(), "RF/SF not met")
460354

461-
// Verify Monitoring Console is Ready and stays in ready state
462-
Expect(testcaseEnvInst.VerifyMonitoringConsoleReady(ctx, deployment, deployment.GetName(), mc)).To(Succeed(), "Monitoring Console not ready")
463-
464355
// Get Pod age to check for pod resets later
465356
splunkPodUIDs = testenv.GetPodUIDs(testcaseEnvInst.GetName())
466357

@@ -471,10 +362,7 @@ var _ = Describe("m4appfw test", func() {
471362
shcAppSourceInfo.CrAppVersion = appVersion
472363
shcAppSourceInfo.CrAppList = appListV1
473364
shcAppSourceInfo.CrAppFileList = testenv.GetAppFileList(appListV1)
474-
mcAppSourceInfo.CrAppVersion = appVersion
475-
mcAppSourceInfo.CrAppList = appListV1
476-
mcAppSourceInfo.CrAppFileList = testenv.GetAppFileList(appListV1)
477-
allAppSourceInfo = []testenv.AppSourceInfo{cmAppSourceInfo, shcAppSourceInfo, mcAppSourceInfo}
365+
allAppSourceInfo = []testenv.AppSourceInfo{cmAppSourceInfo, shcAppSourceInfo}
478366
_, err = testcaseEnvInst.VerifyAppFrameworkState(ctx, deployment, allAppSourceInfo, splunkPodUIDs, clusterManagerBundleHash)
479367
Expect(err).To(Succeed(), "Failed to verify app framework state")
480368

0 commit comments

Comments
 (0)