[202505] Backport recent PRs and update skip condition for test_duplicate_routes#21030
Merged
yejianquan merged 5 commits intosonic-net:202505from Oct 23, 2025
Merged
Conversation
… to supp…" (sonic-net#20334) This reverts commit 275caa3.
…de (sonic-net#20357) The sonic-sairedis change from sonic-net/sonic-sairedis#1613 modified the behavior of BULK operations which resulted in the log spew looking different before and after on API failures. This impacts test_duplicate_route.py. As this test is failing with the above sonic-sairedis change included, sonic-buildimage PRs that bump up the submodule reference fail pipeline checks. The fix is to move all regexes to the ignore list so that the test can continue to pass with and without this sonic-sairedis change. Once the sairedis change merges, we can change the ignore list to the expect list.
Collaborator
|
/azp run |
lizhijianrd
requested review from
StormLiangMS,
prabhataravind and
yejianquan
|
Azure Pipelines successfully started running 1 pipeline(s). |
This was referenced Oct 20, 2025
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
yejianquan
reviewed
Oct 23, 2025
tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
Outdated
Show resolved
Hide resolved
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
11 tasks
lizhijianrd
added a commit
to Azure/sonic-mgmt.msft
that referenced
this pull request
Nov 4, 2025
**What's the motivation?** Remove the conditional skip to expose the issue. (PR for 202505: sonic-net/sonic-mgmt#21030) **How did you do?** Remove the conditional mark. **How did you verify?** Verified on M1 testbed.
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
Summary:
test_duplicate_routes is expected to run and pass on 202505 branch
Type of change
Back port request
Approach
What is the motivation for this PR?
How did you do it?
How did you verify/test it?
Verified on Arista-7050CX3 M1 testbed.
Any platform specific information?
Supported testbed topology if it's a new test case?
Documentation