Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CSPL-3229 Integration Test Updates #1415

Closed
wants to merge 8 commits into from
19 changes: 10 additions & 9 deletions .github/workflows/int-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
- develop
- main
- feature**
- CSPL_3229_inttests
jobs:
build-operator-image:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -55,16 +56,16 @@ jobs:
matrix:
test:
[
appframeworksS1,
managerappframeworkc3,
managerappframeworkm4,
managersecret,
managersmartstore,
# appframeworksS1,
# managerappframeworkc3,
# managerappframeworkm4,
# managersecret,
# managersmartstore,
managermc1,
managermc2,
managercrcrud,
licensemanager,
managerdeletecr,
# managermc2,
# managercrcrud,
# licensemanager,
# managerdeletecr,
]
runs-on: ubuntu-latest
needs: build-operator-image
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/manual-int-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,6 @@ jobs:
managerscaling,
managercrcrud,
licensemanager,
masterappframeworkc3,
masterappframeworkm4,
mastersecret,
mastersmartstore,
mastermc,
masterscaling,
mastercrcrud,
licensemaster,
]
runs-on: ubuntu-latest
env:
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/namespace-scope-int-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,6 @@ jobs:
managerscaling,
managercrcrud,
licensemanager,
masterappframeworkc3,
masterappframeworkm4,
mastersecret,
mastersmartstore,
mastermc,
masterscaling,
mastercrcrud,
licensemaster,
]
runs-on: ubuntu-latest
env:
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/nightly-int-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,6 @@ jobs:
managerscaling,
managercrcrud,
licensemanager,
masterappframeworkc3,
masterappframeworkm4,
mastersecret,
mastersmartstore,
mastermc,
masterscaling,
mastercrcrud,
licensemaster,
]
runs-on: ubuntu-latest
needs: build-operator-image
Expand Down
6 changes: 3 additions & 3 deletions test/monitoring_console/manager_monitoring_console_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -755,12 +755,12 @@ 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)

// ############################ VERIFICATOIN FOR MONITORING CONSOLE TWO POST SHC RECONFIG ###############################
// ############################ VERIFICATION FOR MONITORING CONSOLE TWO POST SHC RECONFIG ###############################

// Check Cluster Manager in Monitoring Console Two Config Map
testcaseEnvInst.Log.Info("Verify Cluster Manager on Monitoring Console Two Config Map after SHC Reconfig")
Expand All @@ -781,7 +781,7 @@ var _ = Describe("Monitoring Console test", func() {
testcaseEnvInst.Log.Info("Checking for Indexer Pod on MC TWO after SHC Reconfig")
testenv.VerifyPodsInMCConfigString(ctx, deployment, testcaseEnvInst, indexerPods, mcTwoName, true, true)

// ############################ VERIFICATOIN FOR MONITORING CONSOLE ONE POST SHC RECONFIG ###############################
// ############################ VERIFICATION FOR MONITORING CONSOLE ONE POST SHC RECONFIG ###############################

// Verify MC ONE is Ready and stays in ready state before running verfications
testenv.VerifyMonitoringConsoleReady(ctx, deployment, mcName, mc, testcaseEnvInst)
Expand Down
6 changes: 3 additions & 3 deletions test/testenv/verificationutils.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func VerifyMonitoringConsoleReady(ctx context.Context, deployment *Deployment, m
// StandaloneReady verify Standalone is in ReadyStatus and does not flip-flop
func StandaloneReady(ctx context.Context, deployment *Deployment, deploymentName string, standalone *enterpriseApi.Standalone, testenvInstance *TestCaseEnv) {
gomega.Eventually(func() enterpriseApi.Phase {
err := deployment.GetInstance(ctx, deploymentName, standalone)
err := deployment.GetInstance(ctx, standalone.Name, standalone)
if err != nil {
return enterpriseApi.PhaseError
}
Expand All @@ -99,7 +99,7 @@ func StandaloneReady(ctx context.Context, deployment *Deployment, deploymentName

// In a steady state, we should stay in Ready and not flip-flop around
gomega.Consistently(func() enterpriseApi.Phase {
_ = deployment.GetInstance(ctx, deployment.GetName(), standalone)
_ = deployment.GetInstance(ctx, standalone.Name, standalone)
DumpGetSplunkVersion(ctx, testenvInstance.GetName(), deployment, "standalone")
return standalone.Status.Phase
}, ConsistentDuration, ConsistentPollInterval).Should(gomega.Equal(enterpriseApi.PhaseReady))
Expand Down Expand Up @@ -139,14 +139,14 @@ func SearchHeadClusterReady(ctx context.Context, deployment *Deployment, testenv
testenvInstance.Log.Info("Waiting for Search Head Cluster phase to be ready", "instance", shc.ObjectMeta.Name, "Phase", shc.Status.Phase)
DumpGetPods(testenvInstance.GetName())

DumpGetSplunkVersion(ctx, testenvInstance.GetName(), deployment, "-shc-")
return shc.Status.Phase
}, deployment.GetTimeout(), PollInterval).Should(gomega.Equal(enterpriseApi.PhaseReady))

// In a steady state, we should stay in Ready and not flip-flop around
gomega.Consistently(func() enterpriseApi.Phase {
_ = deployment.GetInstance(ctx, deployment.GetName(), shc)
testenvInstance.Log.Info("Check for Consistency Search Head Cluster phase to be ready", "instance", shc.ObjectMeta.Name, "Phase", shc.Status.Phase)
DumpGetSplunkVersion(ctx, testenvInstance.GetName(), deployment, "-shc-")
return shc.Status.Phase
}, ConsistentDuration, ConsistentPollInterval).Should(gomega.Equal(enterpriseApi.PhaseReady))
}
Expand Down
Loading