[v18] Reduce flakiness of TestIntegrations/TrustedCluster tests#61731
Merged
rosstimothy merged 1 commit intobranch/v18from Nov 24, 2025
Merged
[v18] Reduce flakiness of TestIntegrations/TrustedCluster tests#61731rosstimothy merged 1 commit intobranch/v18from
rosstimothy merged 1 commit intobranch/v18from
Conversation
The tests establish trust between two clusters, connect via SSH to a host in the leaf, tear down trust, reestablish trust, and then attempt another SSH connection. The flakiness stemmed from tearing down and and reestablishing trust too quickly without first properly verifying that the leaf cluster disappeared from the root before reestablishing trust. While the test did make use of `helpers.WaitForClusters`, it is satisfied if tunnels for clusters were healthy within the last 10s. But this could be true of a stale cluster that was not yet cleaned up. To remedy this the test was updated to first wait for the reverse tunnel for the leaf cluster to be completely gone before reestablishing trust and proceeding. Closes #60836. Closes #48823.
rosstimothy
added
backport
no-changelog
espadolini
approved these changes
Nov 24, 2025
vapopov
approved these changes
Nov 24, 2025
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport #61700 to branch/v18