fix: only disable route check for T2#21582
Merged
auspham merged 2 commits intosonic-net:masterfrom Dec 9, 2025
Merged
Conversation
Collaborator
|
/azp run |
github-actions
bot
requested review from
ZhaohuiS,
rawal01,
saiarcot895,
xwjiang-ms and
yejianquan
|
Azure Pipelines successfully started running 1 pipeline(s). |
cyw233
force-pushed
the
only-disable-route-check-on-t2
branch
from
3f40b07 to
9720553
Compare
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
ZhaohuiS
approved these changes
Dec 5, 2025
Contributor
ZhaohuiS
left a comment
ZhaohuiS
left a comment
There was a problem hiding this comment.
thank you for the quick fix!
Contributor
Author
|
/azpw run |
Collaborator
|
/AzurePipelines run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
ZhaohuiS
approved these changes
Dec 8, 2025
Signed-off-by: Chenyang Wang <[email protected]>
Signed-off-by: Chenyang Wang <[email protected]>
cyw233
force-pushed
the
only-disable-route-check-on-t2
branch
from
cfef952 to
8ee81d2
Compare
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
ZhaohuiS
approved these changes
Dec 9, 2025
auspham
approved these changes
Dec 9, 2025
cyw233
added
Request for msft-202405 Branch
Approved for msft-202405 Branch
and removed
Approved for msft-202405 Branch
labels
12 tasks
Collaborator
|
Cherry-pick PR to msft-202405: Azure/sonic-mgmt.msft#930 |
mssonicbld
added a commit
to mssonicbld/sonic-mgmt.msft
that referenced
this pull request
Dec 12, 2025
<!-- 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. --> Further enhance the routeCheck monitor disable-and-enable logic: - Users can choose which topologies apply the disable-and-enable routeCheck behavior - Use `wait_until()` timeout to verify the routeCheck status is as expected before proceeding to the next step Summary: Fixes # (issue) Microsoft ADO 36101536 ### Type of change <!-- - Fill x for your type of change. - e.g. - [x] Bug fix --> - [ ] Bug fix - [ ] Testbed and Framework(new/improvement) - [ ] New Test case - [ ] Skipped for non-supported platforms - [x] Test case improvement ### Back port request - [ ] 202205 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [x] 202411 - [x] 202505 - [x] 202511 ### Approach #### What is the motivation for this PR? This is a follow-up PR of sonic-net/sonic-mgmt#21582. Not all platforms need the "temporarily disable roureCheck monitor" feature, and the routeCheck monitor will take some time to startup after running `sudo monit start routeCheck` on some platforms. Therefore, we want to allow the users to choose which topologies they want to apply the disable-and-enable routeCheck behavior (Now only T2, LT2 & UT2 are allowed). Besides, we added 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 verified it on a T0 platform and I can confirm this logic will be skipped: https://elastictest.org/scheduler/testplan/69389f2d392767e9bf67ef1a <img width="1606" height="209" alt="image" src="https://github.com/user-attachments/assets/81f5c39b-23b6-4b8c-a2b6-734522702107" /> <img width="1830" height="218" alt="image" src="https://github.com/user-attachments/assets/73357408-f497-40be-ae16-93104246f77e" /> I also verified on a T2 platform and I can confirm this logic is applied there: https://elastictest.org/scheduler/testplan/69389e7794f9e10e4c224c66 <img width="1835" height="356" alt="image" src="https://github.com/user-attachments/assets/2647bd40-b44f-48af-aa68-2bda0397ea2d" /> <img width="1893" height="662" alt="image" src="https://github.com/user-attachments/assets/10391c32-0e27-4186-876f-64f7ae137569" /> #### 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? -->
12 tasks
12 tasks
cyw233
added a commit
to Azure/sonic-mgmt.msft
that referenced
this pull request
Dec 12, 2025
<!-- 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. --> Further enhance the routeCheck monitor disable-and-enable logic: - Users can choose which topologies apply the disable-and-enable routeCheck behavior - Use `wait_until()` timeout to verify the routeCheck status is as expected before proceeding to the next step Summary: Fixes # (issue) Microsoft ADO 36101536 ### Type of change <!-- - Fill x for your type of change. - e.g. - [x] Bug fix --> - [ ] Bug fix - [ ] Testbed and Framework(new/improvement) - [ ] New Test case - [ ] Skipped for non-supported platforms - [x] Test case improvement ### Back port request - [ ] 202205 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [x] 202411 - [x] 202505 - [x] 202511 ### Approach #### What is the motivation for this PR? This is a follow-up PR of sonic-net/sonic-mgmt#21582. Not all platforms need the "temporarily disable roureCheck monitor" feature, and the routeCheck monitor will take some time to startup after running `sudo monit start routeCheck` on some platforms. Therefore, we want to allow the users to choose which topologies they want to apply the disable-and-enable routeCheck behavior (Now only T2, LT2 & UT2 are allowed). Besides, we added 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 verified it on a T0 platform and I can confirm this logic will be skipped: https://elastictest.org/scheduler/testplan/69389f2d392767e9bf67ef1a <img width="1606" height="209" alt="image" src="https://github.com/user-attachments/assets/81f5c39b-23b6-4b8c-a2b6-734522702107" /> <img width="1830" height="218" alt="image" src="https://github.com/user-attachments/assets/73357408-f497-40be-ae16-93104246f77e" /> I also verified on a T2 platform and I can confirm this logic is applied there: https://elastictest.org/scheduler/testplan/69389e7794f9e10e4c224c66 <img width="1835" height="356" alt="image" src="https://github.com/user-attachments/assets/2647bd40-b44f-48af-aa68-2bda0397ea2d" /> <img width="1893" height="662" alt="image" src="https://github.com/user-attachments/assets/10391c32-0e27-4186-876f-64f7ae137569" /> #### 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? --> Signed-off-by: Chenyang Wang <[email protected]>
saravanan-nexthop
pushed a commit
to saravanan-nexthop/sonic-mgmt
that referenced
this pull request
Dec 15, 2025
* fix: only disable route check for T2 Signed-off-by: Chenyang Wang <[email protected]> * Empty commit to re-trigger the pipeline Signed-off-by: Chenyang Wang <[email protected]> --------- Signed-off-by: Chenyang Wang <[email protected]> Signed-off-by: Saravanan <[email protected]>
gshemesh2
pushed a commit
to gshemesh2/sonic-mgmt
that referenced
this pull request
Dec 16, 2025
* fix: only disable route check for T2 Signed-off-by: Chenyang Wang <[email protected]> * Empty commit to re-trigger the pipeline Signed-off-by: Chenyang Wang <[email protected]> --------- Signed-off-by: Chenyang Wang <[email protected]> Signed-off-by: Guy Shemesh <[email protected]>
AharonMalkin
pushed a commit
to AharonMalkin/sonic-mgmt
that referenced
this pull request
Dec 16, 2025
* fix: only disable route check for T2 Signed-off-by: Chenyang Wang <[email protected]> * Empty commit to re-trigger the pipeline Signed-off-by: Chenyang Wang <[email protected]> --------- Signed-off-by: Chenyang Wang <[email protected]> Signed-off-by: Aharon Malkin <[email protected]>
gshemesh2
pushed a commit
to gshemesh2/sonic-mgmt
that referenced
this pull request
Dec 21, 2025
* fix: only disable route check for T2 Signed-off-by: Chenyang Wang <[email protected]> * Empty commit to re-trigger the pipeline Signed-off-by: Chenyang Wang <[email protected]> --------- Signed-off-by: Chenyang Wang <[email protected]> Signed-off-by: Guy Shemesh <[email protected]>
gshemesh2
pushed a commit
to gshemesh2/sonic-mgmt
that referenced
this pull request
Dec 21, 2025
* fix: only disable route check for T2 Signed-off-by: Chenyang Wang <[email protected]> * Empty commit to re-trigger the pipeline Signed-off-by: Chenyang Wang <[email protected]> --------- Signed-off-by: Chenyang Wang <[email protected]> Signed-off-by: Guy Shemesh <[email protected]>
wangxin
pushed a commit
that referenced
this pull request
Dec 22, 2025
Further enhance the routeCheck monitor disable-and-enable logic: Users can choose which topologies apply the disable-and-enable routeCheck behavior Use wait_until() timeout to verify the routeCheck status is as expected before proceeding to the next step What is the motivation for this PR? This is a follow-up PR of #21582. Not all platforms need the "temporarily disable roureCheck monitor" feature, and the routeCheck monitor will take some time to startup after running sudo monit start routeCheck on some platforms. Therefore, we want to allow the users to choose which topologies they want to apply the disable-and-enable routeCheck behavior (Now only T2, LT2 & UT2 are allowed). Besides, we added 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 verified it on a T0 platform and I can confirm this logic will be skipped: Signed-off-by: Chenyang Wang <[email protected]>
wangxin
pushed a commit
that referenced
this pull request
Dec 22, 2025
Further enhance the routeCheck monitor disable-and-enable logic: Users can choose which topologies apply the disable-and-enable routeCheck behavior Use wait_until() timeout to verify the routeCheck status is as expected before proceeding to the next step What is the motivation for this PR? This is a follow-up PR of #21582. Not all platforms need the "temporarily disable roureCheck monitor" feature, and the routeCheck monitor will take some time to startup after running sudo monit start routeCheck on some platforms. Therefore, we want to allow the users to choose which topologies they want to apply the disable-and-enable routeCheck behavior (Now only T2, LT2 & UT2 are allowed). Besides, we added 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 verified it on a T0 platform and I can confirm this logic will be skipped: https://elastictest.org/scheduler/testplan/69389f2d392767e9bf67ef1a image image I also verified on a T2 platform and I can confirm this logic is applied there: https://elastictest.org/scheduler/testplan/69389e7794f9e10e4c224c66 Signed-off-by: Chenyang Wang <[email protected]>
vrajeshe
pushed a commit
to Akshath-17/sonic-mgmt
that referenced
this pull request
Jan 4, 2026
* fix: only disable route check for T2 Signed-off-by: Chenyang Wang <[email protected]> * Empty commit to re-trigger the pipeline Signed-off-by: Chenyang Wang <[email protected]> --------- Signed-off-by: Chenyang Wang <[email protected]> Signed-off-by: Venkata Gouri Rajesh Etla <[email protected]>
venu-nexthop
pushed a commit
to venu-nexthop/sonic-mgmt
that referenced
this pull request
Jan 13, 2026
* fix: only disable route check for T2 Signed-off-by: Chenyang Wang <[email protected]> * Empty commit to re-trigger the pipeline Signed-off-by: Chenyang Wang <[email protected]> --------- Signed-off-by: Chenyang Wang <[email protected]>
yifan-nexthop
pushed a commit
to nexthop-ai/sonic-mgmt
that referenced
this pull request
Jan 14, 2026
* fix: only disable route check for T2 Signed-off-by: Chenyang Wang <[email protected]> * Empty commit to re-trigger the pipeline Signed-off-by: Chenyang Wang <[email protected]> --------- Signed-off-by: Chenyang Wang <[email protected]> Signed-off-by: YiFan Wang <[email protected]>
PriyanshTratiya
pushed a commit
to PriyanshTratiya/sonic-mgmt
that referenced
this pull request
Jan 21, 2026
* fix: only disable route check for T2 Signed-off-by: Chenyang Wang <[email protected]> * Empty commit to re-trigger the pipeline Signed-off-by: Chenyang Wang <[email protected]> --------- Signed-off-by: Chenyang Wang <[email protected]> Signed-off-by: Priyansh Tratiya <[email protected]>
lakshmi-nexthop
pushed a commit
to lakshmi-nexthop/sonic-mgmt
that referenced
this pull request
Jan 28, 2026
* fix: only disable route check for T2 Signed-off-by: Chenyang Wang <[email protected]> * Empty commit to re-trigger the pipeline Signed-off-by: Chenyang Wang <[email protected]> --------- Signed-off-by: Chenyang Wang <[email protected]> Signed-off-by: Lakshmi Yarramaneni <[email protected]>
ytzur1
pushed a commit
to ytzur1/sonic-mgmt
that referenced
this pull request
Feb 2, 2026
* fix: only disable route check for T2 Signed-off-by: Chenyang Wang <[email protected]> * Empty commit to re-trigger the pipeline Signed-off-by: Chenyang Wang <[email protected]> --------- Signed-off-by: Chenyang Wang <[email protected]> Signed-off-by: Yael Tzur <[email protected]>
abhishek-nexthop
pushed a commit
to nexthop-ai/sonic-mgmt
that referenced
this pull request
Feb 6, 2026
* fix: only disable route check for T2 Signed-off-by: Chenyang Wang <[email protected]> * Empty commit to re-trigger the pipeline Signed-off-by: Chenyang Wang <[email protected]> --------- Signed-off-by: Chenyang Wang <[email protected]>
rraghav-cisco
pushed a commit
to rraghav-cisco/sonic-mgmt
that referenced
this pull request
Feb 13, 2026
* fix: only disable route check for T2 Signed-off-by: Chenyang Wang <[email protected]> * Empty commit to re-trigger the pipeline Signed-off-by: Chenyang Wang <[email protected]> --------- Signed-off-by: Chenyang Wang <[email protected]> Signed-off-by: Raghavendran Ramanathan <[email protected]>
anilal-amd
pushed a commit
to anilal-amd/anilal-forked-sonic-mgmt
that referenced
this pull request
Feb 19, 2026
* fix: only disable route check for T2 Signed-off-by: Chenyang Wang <[email protected]> * Empty commit to re-trigger the pipeline Signed-off-by: Chenyang Wang <[email protected]> --------- Signed-off-by: Chenyang Wang <[email protected]> Signed-off-by: Zhuohui Tan <[email protected]>
kazinator-arista
pushed a commit
to kazinator-arista/sonic-mgmt
that referenced
this pull request
Mar 4, 2026
…atically (sonic-net#21582) [submodule] Update submodule sonic-utilities to the latest HEAD automatically
abhishek-nexthop
pushed a commit
to nexthop-ai/sonic-mgmt
that referenced
this pull request
Mar 17, 2026
* fix: only disable route check for T2 Signed-off-by: Chenyang Wang <[email protected]> * Empty commit to re-trigger the pipeline Signed-off-by: Chenyang Wang <[email protected]> --------- Signed-off-by: Chenyang Wang <[email protected]> Signed-off-by: Abhishek <[email protected]>
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
5 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 #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