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

[25.0 backport] De-flake TestSwarmClusterRotateUnlockKey... again... maybe? #47201

Merged

Conversation

thaJeztah
Copy link
Member

This hopefully makes the test less flakey (or removes any flake that would be caused by the test itself).

  1. Adds tail of cluster daemon logs when there is a test failure so we can more easily see what may be happening
  2. Scans the daemon logs to check if the key is rotated before restarting the daemon. This is a little hacky but a little better than assuming it is done after a hard-coded 3 seconds.
  3. Cleans up the node ls check such that it uses a poll function

(cherry picked from commit fbdc025)

- What I did

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

This hopefully makes the test less flakey (or removes any flake that
would be caused by the test itself).

1. Adds tail of cluster daemon logs when there is a test failure so we
   can more easily see what may be happening
2. Scans the daemon logs to check if the key is rotated before
   restarting the daemon. This is a little hacky but a little better
   than assuming it is done after a hard-coded 3 seconds.
3. Cleans up the `node ls` check such that it uses a poll function

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit fbdc025)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah self-assigned this Jan 24, 2024
@thaJeztah thaJeztah marked this pull request as draft January 24, 2024 09:07
@thaJeztah thaJeztah added this to the 25.0.2 milestone Jan 24, 2024
@thaJeztah thaJeztah modified the milestones: 25.0.2, 25.0.3 Jan 31, 2024
@thaJeztah thaJeztah marked this pull request as ready for review February 1, 2024 03:19
@thaJeztah thaJeztah merged commit a140d0d into moby:25.0 Feb 1, 2024
126 checks passed
@thaJeztah thaJeztah deleted the 25.0_backport_swarm_rotate_key_flake branch February 1, 2024 23:13
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.

None yet

2 participants