Skip to content

Cluster listing test case refactor: move into an existing test#4816

Merged
openshift-merge-bot[bot] merged 3 commits intomainfrom
mvacula/cluster-listing-refactor
Apr 9, 2026
Merged

Cluster listing test case refactor: move into an existing test#4816
openshift-merge-bot[bot] merged 3 commits intomainfrom
mvacula/cluster-listing-refactor

Conversation

@mvacula02
Copy link
Copy Markdown
Collaborator

ARO-25831

What

Moves the cluster listing test case into clusters_sharing_resgroup.go test case. The coverage is slightly changed - instead of listing for 1 cluster in separate resource group twice, we now list for 2 clusters within the same resource group.

Why

Currently, the test is creating (seeding) 2 clusters without waiting (0 timeout). This can cause unexpected behavior. Waiting for the clusters, on the other hand, is a wasteful use of resources for such a simple task.

Test clusters_sharing_resgroup.go is an ideal candidate for implementation of the cluster listing test case as it already stands up 2 clusters and expects 3rd cluster to fail. Listing (for only 2 expected) clusters adds another layer of validation as a byproduct.

Testing

This is a refactor of a positive E2E test.

move the cluster listing test case into cluster sharing RG test case to better handle resources and avoid the potentially flaky timeout:0
https://redhat.atlassian.net/browse/ARO-25831
Copilot AI review requested due to automatic review settings April 9, 2026 10:21
@openshift-ci openshift-ci bot requested review from deads2k and mgahagan73 April 9, 2026 10:21
@mvacula02 mvacula02 changed the title Mvacula/cluster listing refactor Cluster listing test case refactor: move into an existing test Apr 9, 2026
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Refactors E2E coverage for resource-group-level cluster listing by removing the standalone “list clusters without node pools” test and incorporating equivalent listing validation into the existing “clusters sharing resource group” scenario, with corresponding suite fixture updates.

Changes:

  • Deleted cluster_list_no_infra.go and removed its test from generated suite-listing fixtures.
  • Added RG-level cluster listing assertions to clusters_sharing_resgroup.go (expects exactly the two created clusters).
  • Adjusted simple_negative_cases.go to accumulate errors more defensively around nodepool version update and to reduce error-level logging for expected failures.

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
test/testdata/zz_fixture_TestMainListSuitesForEachSuite_stage_parallelstage_parallel.txt Removes the deleted listing test from suite output fixture.
test/testdata/zz_fixture_TestMainListSuitesForEachSuite_rp_api_compat_all_parallelrp_api_compat_all_parallel.txt Removes the deleted listing test from suite output fixture.
test/testdata/zz_fixture_TestMainListSuitesForEachSuite_rp_api_compat_all_parallel_01rp_api_compat_all_parallel_development.txt Removes the deleted listing test from suite output fixture.
test/testdata/zz_fixture_TestMainListSuitesForEachSuite_prod_parallelprod_parallel.txt Removes the deleted listing test from suite output fixture.
test/testdata/zz_fixture_TestMainListSuitesForEachSuite_integration_parallelintegration_parallel.txt Removes the deleted listing test from suite output fixture.
test/testdata/zz_fixture_TestMainListSuitesForEachSuite_dev_cd_check_paralleldev_cd_check_parallel.txt Removes the deleted listing test from suite output fixture.
test/e2e/simple_negative_cases.go Makes nodepool version-update negative case more defensive; changes expected-error logging behavior.
test/e2e/clusters_sharing_resgroup.go Adds RG-level listing check for the two created clusters in the shared customer RG.
test/e2e/cluster_list_no_infra.go Deletes the standalone RG cluster listing test.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@mgahagan73
Copy link
Copy Markdown
Collaborator

/approve

@openshift-ci openshift-ci bot added the approved label Apr 9, 2026
Copy link
Copy Markdown
Collaborator

@mbukatov mbukatov left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Apr 9, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mbukatov, mgahagan73, mvacula02

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit bec4074 into main Apr 9, 2026
18 checks passed
@openshift-merge-bot openshift-merge-bot bot deleted the mvacula/cluster-listing-refactor branch April 9, 2026 20:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants