Skip to content

Fixes for test flakes (backport #12775) #12803

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

Jump to bottom
Closed
wants to merge 14 commits into from
Closed

Fixes for test flakes (backport #12775) #12803

wants to merge 14 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 25, 2024

Just another batch of fixes for test flakes

This is an automatic backport of pull request #12775 done by Mergify.

dcorbacho and others added 13 commits November 25, 2024 15:13
@dcorbacho @mergify
Tests: mqtt_shared_SUITE skip check for previous connections
c8ae0a5 
The test checks later based on clientId

(cherry picked from commit 964247a)
@dcorbacho @mergify
tests: clustering_SUITE set small metrics gc interval
0ab87e9 
(cherry picked from commit f295d73)
@dcorbacho @mergify
tests: v5_SUITE wait longer to receive messages
6e3bded 
(cherry picked from commit aa28be0)
@dcorbacho @mergify
Tests: clustering_prop_SUITE retry whole cleanup
3004bfb 
(cherry picked from commit b8cf65a)
@dcorbacho @mergify
Tests: auth_SUITE close all connections in end_per_testcase
bfd3ce0 
(cherry picked from commit 7fe2b04)
@dcorbacho @mergify
Tests: amqp_filtex_SUITE wait for link attachment and longer timeouts
1e1b8f7 
(cherry picked from commit a35f56f)

# Conflicts:
#	deps/rabbit/test/amqp_filtex_SUITE.erl
@dcorbacho @mergify
Tests: clustering_SUITE retry all GET queries
7c401d1 
(cherry picked from commit f39f554)
@dcorbacho @mergify
Tests: amqp_client_SUITE delete all queues on end per testcase
915984a 
(cherry picked from commit 73924ba)
@dcorbacho @mergify
Tests: SSL certificates
633ea11 
Parallel/sharding groups often fail to create certificates in CI.
Most likely it is related to the fact they use the same directory
for certificates. This commit uses shard/node name and unique id
for each SSL certificate

(cherry picked from commit ca0a450)
@MarcialRosales @mergify
Store the certsDir of the group which
235b45d 
initializes rabbitmq configuration

(cherry picked from commit 9b1e762)

# Conflicts:
#	deps/oauth2_client/test/system_SUITE.erl
@MarcialRosales @mergify
Fix issue
c699c9f 
(cherry picked from commit 751dd41)
@MarcialRosales @mergify
Add extra logging
1170f4a 
To capture where the flake occurs

(cherry picked from commit 106012d)
@dcorbacho @mergify
Tests: system_SUITE return configuration from run steps
6687c4e 
(cherry picked from commit 4a925f9)

# Conflicts:
#	deps/oauth2_client/test/system_SUITE.erl
@mergify mergify bot added the conflicts label Nov 25, 2024
@mergify Mergify
Copy link
Author

mergify bot commented Nov 25, 2024

Cherry-pick of a35f56f has failed:

On branch mergify/bp/v4.0.x/pr-12775
Your branch is ahead of 'origin/v4.0.x' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a35f56fdc2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   deps/rabbit/test/amqp_filtex_SUITE.erl

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 9b1e762 has failed:

On branch mergify/bp/v4.0.x/pr-12775
Your branch is ahead of 'origin/v4.0.x' by 9 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 9b1e762081.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/oauth2_client/test/system_SUITE.erl

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 4a925f9 has failed:

On branch mergify/bp/v4.0.x/pr-12775
Your branch is ahead of 'origin/v4.0.x' by 12 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 4a925f9a8c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/oauth2_client/test/system_SUITE.erl

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-12775 branch November 25, 2024 17:48
@michaelklishin
Copy link
Collaborator

Will request another backport.

@mergify mergify bot mentioned this pull request Nov 25, 2024
Merged
@michaelklishin
Copy link
Collaborator

Mergify is not intelligent enough to determine that a branch was deleted, and GitHub does not detect that a commit was removed by force-pushing a backport branch.

@michaelklishin
Copy link
Collaborator

@dcorbacho @MarcialRosales this needs a manual backport for v4.0.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@dcorbacho dcorbacho

Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@michaelklishin @dcorbacho @MarcialRosales