[action] [PR:21582] fix: only disable route check for T2#930
Merged
cyw233 merged 1 commit intoAzure:202405from Dec 12, 2025
Merged
[action] [PR:21582] fix: only disable route check for T2#930cyw233 merged 1 commit intoAzure:202405from
cyw233 merged 1 commit intoAzure:202405from
Conversation
<!-- Please make sure you've read and understood our contributing guidelines; https://github.com/sonic-net/SONiC/blob/gh-pages/CONTRIBUTING.md Please provide following information to help code review process a bit easier: --> ### Description of PR <!-- - Please include a summary of the change and which issue is fixed. - Please also include relevant motivation and context. Where should reviewer start? background context? - List any dependencies that are required for this change. --> Change the `temporarily_disable_route_check` fixture logic to only apply to T2 topology for now. Summary: Fixes # (issue) Microsoft ADO 36101536 ### Type of change <!-- - Fill x for your type of change. - e.g. - [x] Bug fix --> - [x] Bug fix - [ ] Testbed and Framework(new/improvement) - [ ] New Test case - [ ] Skipped for non-supported platforms - [ ] Test case improvement ### Back port request - [ ] 202205 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [x] 202505 - [x] 202511 ### Approach #### What is the motivation for this PR? The current disable-and-enable routeCheck monitor logic is causing test flakiness on some non-T2 platforms (see sonic-net/sonic-mgmt#16876 (comment)). Certain platforms require additional time to restart the routeCheck monitor, which can leave it inactive when the next test begins and result in false failures. We would like to address this issue urgently in this PR. In a follow-up PR, I will properly enhance the `temporarily_disable_route_check` fixture so that: - Users can choose which topologies apply the disable-and-enable routeCheck behavior - The fixture uses a `wait_until()` timeout to verify the routeCheck status is as expected before proceeding to the next step #### How did you do it? #### How did you verify/test it? I ran the updated login on a non-T2 platform (Mx) and can confirm it's working well: https://elastictest.org/scheduler/testplan/693272f7392767e9bf67e930 <img width="1609" height="202" alt="image" src="https://github.com/user-attachments/assets/e631a351-1372-412d-bca7-6b4ef5d8112a" /> I also verified the logic on T2 platform and can confirm it's still having this logic: https://elastictest.org/scheduler/testplan/6932767fbcc3fac23371a83c <img width="1963" height="546" alt="image" src="https://github.com/user-attachments/assets/261dd79b-c847-4a82-9409-d87e48a3cfa8" /> #### Any platform specific information? #### Supported testbed topology if it's a new test case? ### Documentation <!-- (If it's a new feature, new test case) Did you update documentation/Wiki relevant to your implementation? Link to the wiki page? -->
Collaborator
Author
|
Original PR: sonic-net/sonic-mgmt#21582 |
Collaborator
Author
|
/azp run |
|
Azure Pipelines could not run because the pipeline triggers exclude this branch/path. |
12 tasks
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
2 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.
Description of PR
Change the
temporarily_disable_route_checkfixture logic to only apply to T2 topology for now.Summary:
Fixes # (issue) Microsoft ADO 36101536
Type of change
Back port request
Approach
What is the motivation for this PR?
The current disable-and-enable routeCheck monitor logic is causing test flakiness on some non-T2 platforms (see sonic-net/sonic-mgmt#16876 (comment)). Certain platforms require additional time to restart the routeCheck monitor, which can leave it inactive when the next test begins and result in false failures. We would like to address this issue urgently in this PR.
In a follow-up PR, I will properly enhance the
temporarily_disable_route_checkfixture so that:wait_until()timeout to verify the routeCheck status is as expected before proceeding to the next stepHow did you do it?
How did you verify/test it?
I ran the updated login on a non-T2 platform (Mx) and can confirm it's working well:
https://elastictest.org/scheduler/testplan/693272f7392767e9bf67e930
I also verified the logic on T2 platform and can confirm it's still having this logic: https://elastictest.org/scheduler/testplan/6932767fbcc3fac23371a83c
Any platform specific information?
Supported testbed topology if it's a new test case?
Documentation