Skip to content

Commit 772f74c

Browse files
Fix compilation errors in GCP M4 tests
- Remove unused corev1 import from appframework_gcs_test.go - Remove unused corev1 import from manager_appframework_test.go - Remove all remaining MC code from 3 test functions in manager_appframework_test.go - Fixes undefined: corev1 errors at lines 843, 1440, 1576 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
1 parent 13938eb commit 772f74c

2 files changed

Lines changed: 13 additions & 153 deletions

File tree

test/appframework_gcp/m4/appframework_gcs_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
splcommon "github.com/splunk/splunk-operator/pkg/splunk/common"
2929
"github.com/splunk/splunk-operator/pkg/splunk/enterprise"
3030
testenv "github.com/splunk/splunk-operator/test/testenv"
31-
corev1 "k8s.io/api/core/v1"
3231
)
3332

3433
var _ = Describe("m4appfw test", func() {

test/appframework_gcp/m4/manager_appframework_test.go

Lines changed: 13 additions & 152 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
splcommon "github.com/splunk/splunk-operator/pkg/splunk/common"
2828
"github.com/splunk/splunk-operator/pkg/splunk/enterprise"
2929
testenv "github.com/splunk/splunk-operator/test/testenv"
30-
corev1 "k8s.io/api/core/v1"
3130
)
3231

3332
var _ = Describe("m4appfw test", func() {
@@ -791,9 +790,6 @@ var _ = Describe("m4appfw test", func() {
791790
It("integration, m4, appframework: can deploy a M4 SVA with App Framework enabled for manual poll", NodeTimeout(testenv.MediumLongTimeout), func(ctx SpecContext) {
792791
/* Test Steps
793792
################## SETUP ####################
794-
* Upload V1 apps to GCP for Monitoring Console
795-
* Create app source for Monitoring Console
796-
* Prepare and deploy Monitoring Console with app framework and wait for the pod to be ready
797793
* Upload V1 apps to GCP
798794
* Create app source with manaul poll for M4 SVA (Cluster Manager and Deployer)
799795
* Prepare and deploy M4 CRD with app framework and wait for pods to be ready
@@ -822,42 +818,12 @@ var _ = Describe("m4appfw test", func() {
822818
*/
823819

824820
// ################## SETUP ####################
825-
// Upload V1 apps to GCP for Monitoring Console
826821
appVersion := "V1"
827822
appFileList := testenv.GetAppFileList(appListV1)
828-
testcaseEnvInst.Log.Info(fmt.Sprintf("Upload %s apps to GCP for Monitoring Console", appVersion))
829-
s3TestDirMC := "m4appfw-mc-" + testenv.RandomDNSName(4)
830-
uploadedFiles, err := testenv.UploadFilesToGCP(testGcsBucket, s3TestDirMC, appFileList, downloadDirV1)
831-
Expect(err).To(Succeed(), fmt.Sprintf("Unable to upload %s apps to GCP test directory for Monitoring Console %s", appVersion, testGcsBucket))
832-
uploadedApps = append(uploadedApps, uploadedFiles...)
833-
834-
// Create App Framework Spec for Monitoring Console
835-
appSourceNameMC := "appframework-" + enterpriseApi.ScopeLocal + "mc-" + testenv.RandomDNSName(3)
836-
volumeNameMC := "appframework-test-volume-mc-" + testenv.RandomDNSName(3)
837-
appFrameworkSpecMC := testcaseEnvInst.GenerateAppFrameworkSpec(ctx, volumeNameMC, enterpriseApi.ScopeLocal, appSourceNameMC, s3TestDirMC, 0)
838-
mcSpec := enterpriseApi.MonitoringConsoleSpec{
839-
CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{
840-
Spec: enterpriseApi.Spec{
841-
ImagePullPolicy: "IfNotPresent",
842-
Image: testcaseEnvInst.GetSplunkImage(),
843-
},
844-
Volumes: []corev1.Volume{},
845-
},
846-
AppFrameworkConfig: appFrameworkSpecMC,
847-
}
848-
849-
// Deploy Monitoring Console
850-
testcaseEnvInst.Log.Info("Deploy Monitoring Console")
851-
mcName := deployment.GetName()
852-
mc, err := deployment.DeployMonitoringConsoleWithGivenSpec(ctx, testcaseEnvInst.GetName(), mcName, mcSpec)
853-
Expect(err).To(Succeed(), "Unable to deploy Monitoring Console")
854-
855-
// Verify Monitoring Console is ready and stays in ready state
856-
Expect(testcaseEnvInst.VerifyMonitoringConsoleReady(ctx, deployment, deployment.GetName(), mc)).To(Succeed(), "Monitoring Console not ready")
857823

858824
// Upload V1 apps to GCP for Indexer Cluster
859825
testcaseEnvInst.Log.Info(fmt.Sprintf("Upload %s apps to GCP for Indexer Cluster", appVersion))
860-
uploadedFiles, err = testenv.UploadFilesToGCP(testGcsBucket, s3TestDirIdxc, appFileList, downloadDirV1)
826+
uploadedFiles, err := testenv.UploadFilesToGCP(testGcsBucket, s3TestDirIdxc, appFileList, downloadDirV1)
861827
Expect(err).To(Succeed(), fmt.Sprintf("Unable to upload %s apps to GCP test directory for Indexer Cluster %s", appVersion, testGcsBucket))
862828
uploadedApps = append(uploadedApps, uploadedFiles...)
863829

@@ -877,7 +843,7 @@ var _ = Describe("m4appfw test", func() {
877843
shReplicas := 3
878844
indexersPerSite := 1
879845
testcaseEnvInst.Log.Info("Deploy Multisite Indexer Cluster")
880-
cm, _, shc, err := deployment.DeployMultisiteClusterWithSearchHeadAndAppFramework(ctx, deployment.GetName(), indexersPerSite, siteCount, appFrameworkSpecIdxc, appFrameworkSpecShc, true, mcName, "")
846+
cm, _, shc, err := deployment.DeployMultisiteClusterWithSearchHeadAndAppFramework(ctx, deployment.GetName(), indexersPerSite, siteCount, appFrameworkSpecIdxc, appFrameworkSpecShc, true, "", "")
881847
Expect(err).To(Succeed(), "Unable to deploy Multisite Indexer Cluster with App Framework")
882848

883849
// Ensure that the Cluster Manager goes to Ready phase
@@ -895,9 +861,6 @@ var _ = Describe("m4appfw test", func() {
895861
// Verify RF SF is met
896862
Expect(testcaseEnvInst.VerifyRFSFMet(ctx, deployment)).To(Succeed(), "RF/SF not met")
897863

898-
// Verify Monitoring Console is ready and stays in ready state
899-
Expect(testcaseEnvInst.VerifyMonitoringConsoleReady(ctx, deployment, deployment.GetName(), mc)).To(Succeed(), "Monitoring Console not ready")
900-
901864
// Get Pod age to check for pod resets later
902865
splunkPodUIDs := testenv.GetPodUIDs(testcaseEnvInst.GetName())
903866

@@ -907,11 +870,9 @@ var _ = Describe("m4appfw test", func() {
907870
shcPodNames = testenv.GeneratePodNameSlice(testenv.SearchHeadPod, deployment.GetName(), shReplicas, false, 1)
908871
cmPod := []string{fmt.Sprintf(testenv.ClusterManagerPod, deployment.GetName())}
909872
deployerPod := []string{fmt.Sprintf(testenv.DeployerPod, deployment.GetName())}
910-
mcPod := []string{fmt.Sprintf(testenv.MonitoringConsolePod, deployment.GetName())}
911873
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}
912874
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}
913-
mcAppSourceInfo := testenv.AppSourceInfo{CrKind: mc.Kind, CrName: mc.Name, CrAppSourceName: appSourceNameMC, CrAppSourceVolumeName: appSourceNameMC, CrPod: mcPod, CrAppVersion: appVersion, CrAppScope: enterpriseApi.ScopeLocal, CrAppList: appListV1, CrAppFileList: appFileList}
914-
allAppSourceInfo := []testenv.AppSourceInfo{cmAppSourceInfo, shcAppSourceInfo, mcAppSourceInfo}
875+
allAppSourceInfo := []testenv.AppSourceInfo{cmAppSourceInfo, shcAppSourceInfo}
915876
clusterManagerBundleHash, err := testcaseEnvInst.VerifyAppFrameworkState(ctx, deployment, allAppSourceInfo, splunkPodUIDs, "")
916877
Expect(err).To(Succeed(), "Failed to verify app framework state")
917878

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

937-
// Upload V2 apps to GCP for Monitoring Console
938-
testcaseEnvInst.Log.Info(fmt.Sprintf("Upload %s apps to GCP for Monitoring Console", appVersion))
939-
uploadedFiles, err = testenv.UploadFilesToGCP(testGcsBucket, s3TestDirMC, appFileList, downloadDirV2)
940-
Expect(err).To(Succeed(), fmt.Sprintf("Unable to upload %s apps to GCP test directory for Monitoring Console %s", appVersion, testGcsBucket))
941-
uploadedApps = append(uploadedApps, uploadedFiles...)
942-
943898
// Check for changes in App phase to determine if next poll has been triggered
944899
testcaseEnvInst.WaitforPhaseChange(ctx, deployment, deployment.GetName(), cm.Kind, appSourceNameIdxc, appFileList)
945900

@@ -958,9 +913,6 @@ var _ = Describe("m4appfw test", func() {
958913
// Verify RF SF is met
959914
Expect(testcaseEnvInst.VerifyRFSFMet(ctx, deployment)).To(Succeed(), "RF/SF not met")
960915

961-
// Verify Monitoring Console is ready and stays in ready state
962-
Expect(testcaseEnvInst.VerifyMonitoringConsoleReady(ctx, deployment, deployment.GetName(), mc)).To(Succeed(), "Monitoring Console not ready")
963-
964916
// ############ VERIFICATION APPS ARE NOT UPDATED BEFORE ENABLING MANUAL POLL ############
965917
appVersion = "V1"
966918
allPodNames := append(idxcPodNames, shcPodNames...)
@@ -1000,22 +952,6 @@ var _ = Describe("m4appfw test", func() {
1000952
// Verify RF SF is met
1001953
Expect(testcaseEnvInst.VerifyRFSFMet(ctx, deployment)).To(Succeed(), "RF/SF not met")
1002954

1003-
testcaseEnvInst.Log.Info("Get config map for triggering manual update")
1004-
config, err = testenv.GetAppframeworkManualUpdateConfigMap(ctx, deployment, testcaseEnvInst.GetName())
1005-
Expect(err).To(Succeed(), "Unable to get config map for manual poll")
1006-
1007-
testcaseEnvInst.Log.Info("Modify config map to trigger manual update")
1008-
config.Data["MonitoringConsole"] = strings.Replace(config.Data["MonitoringConsole"], "off", "on", 1)
1009-
err = deployment.UpdateCR(ctx, config)
1010-
Expect(err).To(Succeed(), "Unable to update config map")
1011-
1012-
// Wait for Monitoring Console to reach Ready phase
1013-
err = testcaseEnvInst.WaitForMonitoringConsolePhase(ctx, deployment, testcaseEnvInst.GetName(), mc.Name, enterpriseApi.PhaseReady, 10*time.Minute)
1014-
Expect(err).To(Succeed(), "Timed out waiting for MonitoringConsole to reach Ready phase")
1015-
1016-
// Verify Monitoring Console is ready and stays in ready state
1017-
Expect(testcaseEnvInst.VerifyMonitoringConsoleReady(ctx, deployment, deployment.GetName(), mc)).To(Succeed(), "Monitoring Console not ready")
1018-
1019955
// Get Pod age to check for pod resets later
1020956
splunkPodUIDs = testenv.GetPodUIDs(testcaseEnvInst.GetName())
1021957

@@ -1025,7 +961,7 @@ var _ = Describe("m4appfw test", func() {
1025961
testcaseEnvInst.Log.Info(fmt.Sprintf("Verify config map set back to off after poll trigger for %s app", appVersion))
1026962
config, _ = testenv.GetAppframeworkManualUpdateConfigMap(ctx, deployment, testcaseEnvInst.GetName())
1027963

1028-
Expect(strings.Contains(config.Data["ClusterManager"], "status: off") && strings.Contains(config.Data["SearchHeadCluster"], "status: off") && strings.Contains(config.Data["MonitoringConsole"], "status: off")).To(Equal(true), "Config map update not complete")
964+
Expect(strings.Contains(config.Data["ClusterManager"], "status: off") && strings.Contains(config.Data["SearchHeadCluster"], "status: off")).To(Equal(true), "Config map update not complete")
1029965

1030966
// ############ VERIFY APPS UPDATED TO V2 #############
1031967
appVersion = "V2"
@@ -1035,10 +971,7 @@ var _ = Describe("m4appfw test", func() {
1035971
shcAppSourceInfo.CrAppVersion = appVersion
1036972
shcAppSourceInfo.CrAppList = appListV2
1037973
shcAppSourceInfo.CrAppFileList = testenv.GetAppFileList(appListV2)
1038-
mcAppSourceInfo.CrAppVersion = appVersion
1039-
mcAppSourceInfo.CrAppList = appListV2
1040-
mcAppSourceInfo.CrAppFileList = testenv.GetAppFileList(appListV2)
1041-
allAppSourceInfo = []testenv.AppSourceInfo{cmAppSourceInfo, shcAppSourceInfo, mcAppSourceInfo}
974+
allAppSourceInfo = []testenv.AppSourceInfo{cmAppSourceInfo, shcAppSourceInfo}
1042975
_, err = testcaseEnvInst.VerifyAppFrameworkState(ctx, deployment, allAppSourceInfo, splunkPodUIDs, clusterManagerBundleHash)
1043976
Expect(err).To(Succeed(), "Failed to verify app framework state")
1044977

@@ -1471,9 +1404,6 @@ var _ = Describe("m4appfw test", func() {
14711404

14721405
/* Test Steps
14731406
################## SETUP ####################
1474-
* Upload V1 apps to GCP for Monitoring Console
1475-
* Create app source for Monitoring Console
1476-
* Prepare and deploy Monitoring Console CRD with app framework and wait for the pod to be ready
14771407
* Upload big-size app to GCP for Indexer Cluster and Search Head Cluster
14781408
* Create app sources for Cluster Manager and Deployer
14791409
* Prepare and deploy M4 CRD with app framework
@@ -1484,52 +1414,19 @@ var _ = Describe("m4appfw test", func() {
14841414
*/
14851415

14861416
//################## SETUP ####################
1487-
// Upload V1 apps to GCP for Monitoring Console
1488-
appVersion := "V1"
1489-
appFileList := testenv.GetAppFileList(appListV1)
1490-
testcaseEnvInst.Log.Info(fmt.Sprintf("Upload %s apps to GCP for Monitoring Console", appVersion))
1491-
s3TestDirMC := "m4appfw-mc-" + testenv.RandomDNSName(4)
1492-
uploadedFiles, err := testenv.UploadFilesToGCP(testGcsBucket, s3TestDirMC, appFileList, downloadDirV1)
1493-
Expect(err).To(Succeed(), fmt.Sprintf("Unable to upload %s apps to GCP test directory for Monitoring Console %s", appVersion, testGcsBucket))
1494-
uploadedApps = append(uploadedApps, uploadedFiles...)
1495-
1496-
// Prepare Monitoring Console spec with its own app source
1497-
appSourceNameMC := "appframework-" + enterpriseApi.ScopeLocal + "mc-" + testenv.RandomDNSName(3)
1498-
appSourceVolumeNameMC := "appframework-test-volume-mc-" + testenv.RandomDNSName(3)
1499-
appFrameworkSpecMC := testcaseEnvInst.GenerateAppFrameworkSpec(ctx, appSourceVolumeNameMC, enterpriseApi.ScopeLocal, appSourceNameMC, s3TestDirMC, 60)
1500-
1501-
mcSpec := enterpriseApi.MonitoringConsoleSpec{
1502-
CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{
1503-
Spec: enterpriseApi.Spec{
1504-
ImagePullPolicy: "IfNotPresent",
1505-
Image: testcaseEnvInst.GetSplunkImage(),
1506-
},
1507-
Volumes: []corev1.Volume{},
1508-
},
1509-
AppFrameworkConfig: appFrameworkSpecMC,
1510-
}
1511-
1512-
// Deploy Monitoring Console
1513-
testcaseEnvInst.Log.Info("Deploy Monitoring Console")
1514-
mcName := deployment.GetName()
1515-
mc, err := deployment.DeployMonitoringConsoleWithGivenSpec(ctx, testcaseEnvInst.GetName(), mcName, mcSpec)
1516-
Expect(err).To(Succeed(), "Unable to deploy Monitoring Console")
1517-
1518-
// Verify Monitoring Console is ready and stays in ready state
1519-
Expect(testcaseEnvInst.VerifyMonitoringConsoleReady(ctx, deployment, deployment.GetName(), mc)).To(Succeed(), "Monitoring Console not ready")
15201417

15211418
// Download all test apps from GCP
15221419
appList := append(testenv.BigSingleApp, testenv.ExtraApps...)
1523-
appFileList = testenv.GetAppFileList(appList)
1524-
err = testenv.DownloadFilesFromGCP(testDataGcsBucket, testenv.AppLocationV1, downloadDirV1, appFileList)
1420+
appFileList := testenv.GetAppFileList(appList)
1421+
err := testenv.DownloadFilesFromGCP(testDataGcsBucket, testenv.AppLocationV1, downloadDirV1, appFileList)
15251422
Expect(err).To(Succeed(), "Unable to download apps")
15261423

15271424
// Upload big-size app to GCP for Cluster Manager
15281425
appList = testenv.BigSingleApp
15291426
appFileList = testenv.GetAppFileList(appList)
15301427
testcaseEnvInst.Log.Info("Upload big-size app to GCP for Cluster Manager")
15311428
s3TestDirIdxc = "m4appfw-idxc-" + testenv.RandomDNSName(4)
1532-
uploadedFiles, err = testenv.UploadFilesToGCP(testGcsBucket, s3TestDirIdxc, appFileList, downloadDirV1)
1429+
uploadedFiles, err := testenv.UploadFilesToGCP(testGcsBucket, s3TestDirIdxc, appFileList, downloadDirV1)
15331430
Expect(err).To(Succeed(), "Unable to upload big-size app to GCP test directory for Cluster Manager")
15341431
uploadedApps = append(uploadedApps, uploadedFiles...)
15351432

@@ -1552,7 +1449,7 @@ var _ = Describe("m4appfw test", func() {
15521449
testcaseEnvInst.Log.Info("Deploy Multisite Indexer Cluster with Search Head Cluster")
15531450
siteCount := 3
15541451
indexersPerSite := 1
1555-
cm, _, shc, err := deployment.DeployMultisiteClusterWithSearchHeadAndAppFramework(ctx, deployment.GetName(), indexersPerSite, siteCount, appFrameworkSpecIdxc, appFrameworkSpecShc, true, mcName, "")
1452+
cm, _, shc, err := deployment.DeployMultisiteClusterWithSearchHeadAndAppFramework(ctx, deployment.GetName(), indexersPerSite, siteCount, appFrameworkSpecIdxc, appFrameworkSpecShc, true, "", "")
15561453
Expect(err).To(Succeed(), "Unable to deploy Multisite Indexer Cluster and Search Head Cluster with App Framework")
15571454

15581455
// Verify App installation is in progress on Cluster Manager
@@ -1606,9 +1503,6 @@ var _ = Describe("m4appfw test", func() {
16061503

16071504
/* Test Steps
16081505
################## SETUP ####################
1609-
* Upload V1 apps to GCP for Monitoring Console
1610-
* Create app source for Monitoring Console
1611-
* Prepare and deploy Monitoring Console CRD with app framework and wait for the pod to be ready
16121506
* Upload big-size app to GCP for Indexer Cluster and Search Head Cluster
16131507
* Create app sources for Cluster Manager and Deployer
16141508
* Prepare and deploy M4 CRD with app framework and wait for the pods to be ready
@@ -1620,52 +1514,19 @@ var _ = Describe("m4appfw test", func() {
16201514
*/
16211515

16221516
//################## SETUP ####################
1623-
// Upload V1 apps to GCP for Monitoring Console
1624-
appVersion := "V1"
1625-
appFileList := testenv.GetAppFileList(appListV1)
1626-
testcaseEnvInst.Log.Info(fmt.Sprintf("Upload %s apps to GCP for Monitoring Console", appVersion))
1627-
s3TestDirMC := "m4appfw-mc-" + testenv.RandomDNSName(4)
1628-
uploadedFiles, err := testenv.UploadFilesToGCP(testGcsBucket, s3TestDirMC, appFileList, downloadDirV1)
1629-
Expect(err).To(Succeed(), fmt.Sprintf("Unable to upload %s apps to GCP test directory for Monitoring Console %s", appVersion, testGcsBucket))
1630-
uploadedApps = append(uploadedApps, uploadedFiles...)
1631-
1632-
// Prepare Monitoring Console spec with its own app source
1633-
appSourceNameMC := "appframework-" + enterpriseApi.ScopeLocal + "mc-" + testenv.RandomDNSName(3)
1634-
appSourceVolumeNameMC := "appframework-test-volume-mc-" + testenv.RandomDNSName(3)
1635-
appFrameworkSpecMC := testcaseEnvInst.GenerateAppFrameworkSpec(ctx, appSourceVolumeNameMC, enterpriseApi.ScopeLocal, appSourceNameMC, s3TestDirMC, 60)
1636-
1637-
mcSpec := enterpriseApi.MonitoringConsoleSpec{
1638-
CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{
1639-
Spec: enterpriseApi.Spec{
1640-
ImagePullPolicy: "IfNotPresent",
1641-
Image: testcaseEnvInst.GetSplunkImage(),
1642-
},
1643-
Volumes: []corev1.Volume{},
1644-
},
1645-
AppFrameworkConfig: appFrameworkSpecMC,
1646-
}
1647-
1648-
// Deploy Monitoring Console
1649-
testcaseEnvInst.Log.Info("Deploy Monitoring Console")
1650-
mcName := deployment.GetName()
1651-
mc, err := deployment.DeployMonitoringConsoleWithGivenSpec(ctx, testcaseEnvInst.GetName(), mcName, mcSpec)
1652-
Expect(err).To(Succeed(), "Unable to deploy Monitoring Console")
1653-
1654-
// Verify Monitoring Console is ready and stays in ready state
1655-
Expect(testcaseEnvInst.VerifyMonitoringConsoleReady(ctx, deployment, deployment.GetName(), mc)).To(Succeed(), "Monitoring Console not ready")
16561517

16571518
// Download all test apps from GCP
16581519
appList := append(testenv.BigSingleApp, testenv.ExtraApps...)
1659-
appFileList = testenv.GetAppFileList(appList)
1660-
err = testenv.DownloadFilesFromGCP(testDataGcsBucket, testenv.AppLocationV1, downloadDirV1, appFileList)
1520+
appFileList := testenv.GetAppFileList(appList)
1521+
err := testenv.DownloadFilesFromGCP(testDataGcsBucket, testenv.AppLocationV1, downloadDirV1, appFileList)
16611522
Expect(err).To(Succeed(), "Unable to download apps")
16621523

16631524
// Upload big-size app to GCP for Cluster Manager
16641525
appList = testenv.BigSingleApp
16651526
appFileList = testenv.GetAppFileList(appList)
16661527
testcaseEnvInst.Log.Info("Upload big-size app to GCP for Cluster Manager")
16671528
s3TestDirIdxc = "m4appfw-idxc-" + testenv.RandomDNSName(4)
1668-
uploadedFiles, err = testenv.UploadFilesToGCP(testGcsBucket, s3TestDirIdxc, appFileList, downloadDirV1)
1529+
uploadedFiles, err := testenv.UploadFilesToGCP(testGcsBucket, s3TestDirIdxc, appFileList, downloadDirV1)
16691530
Expect(err).To(Succeed(), "Unable to upload big-size app to GCP test directory for Cluster Manager")
16701531
uploadedApps = append(uploadedApps, uploadedFiles...)
16711532

@@ -1689,7 +1550,7 @@ var _ = Describe("m4appfw test", func() {
16891550
siteCount := 3
16901551
shReplicas := 3
16911552
indexersPerSite := 1
1692-
cm, _, shc, err := deployment.DeployMultisiteClusterWithSearchHeadAndAppFramework(ctx, deployment.GetName(), indexersPerSite, siteCount, appFrameworkSpecIdxc, appFrameworkSpecShc, true, mcName, "")
1553+
cm, _, shc, err := deployment.DeployMultisiteClusterWithSearchHeadAndAppFramework(ctx, deployment.GetName(), indexersPerSite, siteCount, appFrameworkSpecIdxc, appFrameworkSpecShc, true, "", "")
16931554
Expect(err).To(Succeed(), "Unable to deploy Multisite Indexer Cluster and Search Head Cluster with App Framework")
16941555

16951556
// Verify App installation is in progress

0 commit comments

Comments
 (0)