Skip to content

Expose CheckClusterIngressHealthy to the pr_test.go #869

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.

Sign up for GitHub

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

Closed
dishankkalra23 wants to merge 8 commits into from
Closed

Expose CheckClusterIngressHealthy to the pr_test.go #869

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3ef3a4d
tests: expose CheckClusterIngressHealthyDefaultTimeout
dishankkalra23 Sep 2, 2024
d76bd07
Merge branch 'main' into expose-clusterIngress
dishankkalra23 Sep 6, 2024
4df91aa
Merge branch 'main' into expose-clusterIngress
dishankkalra23 Sep 12, 2024
cfdf355
fix: update validation
dishankkalra23 Sep 13, 2024
c0f814f
Merge branch 'main' into expose-clusterIngress
dishankkalra23 Sep 15, 2024
71cfc2b
Merge branch 'main' into expose-clusterIngress
dishankkalra23 Sep 24, 2024
95af101
Merge branch 'main' into expose-clusterIngress
dishankkalra23 Sep 30, 2024
96a27d0
Merge branch 'main' into expose-clusterIngress
dishankkalra23 Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions tests/pr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ func TestRunRoksPattern(t *testing.T) {
}
Copy link
Member Author

@dishankkalra23 dishankkalra23 Sep 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ocofaigh @toddgiguere The PostApplyHook never executes because TestRunRoksPattern are skipped when enableSchematicsTests is True. Where should we add the hook because other test methods like TestRunVSIPattern, TestRunVpcPattern are also getting skipped.

Copy link
Member Author

@dishankkalra23 dishankkalra23 Oct 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The landing zone tests executes in schematics and post apply hook is yet to be supported in schematics.

Copy link
Member Author

@dishankkalra23 dishankkalra23 Oct 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Taking this to deep dive today to decide whether we add a support for post apply hook in schematics or is there any other way to approach it?


options := setupOptionsRoksPattern(t, "ocp")
options.PostApplyHook = getClusterIngress

output, err := options.RunTestConsistency()
assert.Nil(t, err, "This should not have errored")
Expand All @@ -239,6 +240,25 @@ func TestRunUpgradeRoksPattern(t *testing.T) {
}
}

func getClusterIngress(options *testhelper.TestOptions) error {

// Get output of the last apply
outputs, outputErr := terraform.OutputAllE(options.Testing, options.TerraformOptions)
if assert.Error(options.Testing, outputErr, "error getting last terraform apply outputs: %s", outputErr) {
return nil
}

// Validate that the "cluster_name" key is present in the outputs
expectedOutputs := []string{"cluster_name"}
_, ValidationErr := testhelper.ValidateTerraformOutputs(outputs, expectedOutputs...)

// Proceed with the cluster ingress health check if "cluster_name" is valid
if assert.NoErrorf(options.Testing, ValidationErr, "Some outputs not found or nil: %s", ValidationErr) {
options.CheckClusterIngressHealthyDefaultTimeout(outputs["cluster_name"].(string))
}
return nil
}

func setupOptionsVsiPattern(t *testing.T, prefix string) *testhelper.TestOptions {

sshPublicKey := sshPublicKey(t)
Expand Down