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

fix: flaky e2e gateway_with_conflicted_listener_cannot_be_merged #3911

Merged
merged 7 commits into from
Jul 24, 2024

Conversation

shawnh2
Copy link
Contributor

@shawnh2 shawnh2 commented Jul 20, 2024

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #3845

@shawnh2 shawnh2 requested a review from a team as a code owner July 20, 2024 09:51
Copy link

codecov bot commented Jul 20, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.36%. Comparing base (9852333) to head (125237d).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3911      +/-   ##
==========================================
- Coverage   67.39%   67.36%   -0.04%     
==========================================
  Files         183      183              
  Lines       22435    22435              
==========================================
- Hits        15121    15113       -8     
- Misses       6226     6231       +5     
- Partials     1088     1091       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@shawnh2
Copy link
Contributor Author

shawnh2 commented Jul 20, 2024

/retest

1 similar comment
@shawnh2
Copy link
Contributor Author

shawnh2 commented Jul 20, 2024

/retest

@shawnh2 shawnh2 marked this pull request as draft July 20, 2024 13:55
@shawnh2 shawnh2 marked this pull request as ready for review July 20, 2024 14:42
@shawnh2
Copy link
Contributor Author

shawnh2 commented Jul 20, 2024

/retest

Copy link
Member

@zirain zirain left a comment

Choose a reason for hiding this comment

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

can you add something like #3914?

@shawnh2
Copy link
Contributor Author

shawnh2 commented Jul 22, 2024

can you add something like #3914?

Done.

Should we only enable CollectAndDump when the test is failed ?

@shawnh2
Copy link
Contributor Author

shawnh2 commented Jul 23, 2024

/retest

@shawnh2 shawnh2 requested review from a team July 23, 2024 14:08
@shawnh2 shawnh2 merged commit 8ec0b71 into envoyproxy:main Jul 24, 2024
24 checks passed
@shawnh2 shawnh2 deleted the fix-e2e-mg branch July 24, 2024 02:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

flaky: TestMergeGateways/BasicMergeGateways/gateway_with_conflicted_listener_cannot_be_merged
3 participants