Skip to content

[manual] [PR:21582] fix: only disable route check for T2#21627

Merged
StormLiangMS merged 1 commit intosonic-net:202505from
cyw233:cherry/202505/21582
Dec 11, 2025
Merged

[manual] [PR:21582] fix: only disable route check for T2#21627
StormLiangMS merged 1 commit intosonic-net:202505from
cyw233:cherry/202505/21582

Conversation

@cyw233
Copy link
Contributor

@cyw233 cyw233 commented Dec 10, 2025

Description of PR

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

  • 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
  • 202505
  • 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 #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
image

I also verified the logic on T2 platform and can confirm it's still having this logic: https://elastictest.org/scheduler/testplan/6932767fbcc3fac23371a83c
image

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

* 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]>
@cyw233 cyw233 requested review from a team and wangxin as code owners December 10, 2025 00:48
@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@cyw233
Copy link
Contributor Author

cyw233 commented Dec 10, 2025

Original PR: #21582

Copy link
Collaborator

@StormLiangMS StormLiangMS left a comment

Choose a reason for hiding this comment

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

LGTM

@StormLiangMS StormLiangMS merged commit 1997103 into sonic-net:202505 Dec 11, 2025
19 checks passed
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
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.

4 participants