[code sync] Merge code from sonic-net/sonic-buildimage:202505 to 202506#1617
Merged
prabhataravind merged 7 commits intoAzure:202506from Sep 17, 2025
Merged
Conversation
Collaborator
mssonicbld
commented
Sep 14, 2025
mssonicbld
commented
…atically (#23998) #### Why I did it src/sonic-utilities ``` * 1203b0b1 - (HEAD -> 202505, origin/202505) Add Arista-7060X6-64PE-B-O128S2, Arista-7060X6-16PE-384C-B-O128S2 to GCU (#4058) (17 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
…lly (#23997) #### Why I did it src/sonic-swss ``` * badf36fa - (HEAD -> 202505, origin/202505) fpmsyncd crashes during execution of sonic-mgmt script vxlan/test_vnet_bgp_route_precedence.py (#3880) (15 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
… (#23996) #### Why I did it src/dhcpmon ``` * 6aa29ed - (HEAD -> 202505, origin/202505) [init] Init physical interfaces without portchannel in counter (Azure#54) (20 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
…alidation (#24000) <!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it Change VXLAN tunnel YANG model to support 2 tunnels + string validation. This is to allow for newer validation in production. ##### Work item tracking - Microsoft ADO **(number only)**: 33013419 #### How I did it Modify vxlan tunnel list model and add unit tests #### How to verify it <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 202205 - [ ] 202211 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [X] 202505 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> Change VXLAN tunnel YANG model to support 2 tunnels + string validation <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
Collaborator
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
458e7e8 to
1161ed8
Compare
Collaborator
Author
|
/azp run |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
Why I did it Updating cisco-8000-smartswitch.ini file signed-off-by: jianquanye@microsoft.com
#### Why I did it platform_tests/api/test_component.py was failing due to the hard coded component name in the corresponding platform.json file not matching the component name retrieved from the Arista platform information API. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Changed the component name in the platform.json file to match our platform information API. #### How to verify it Ran the test with and without the change, confirmed that it passes with the change. #### Which release branch to backport (provide reason below if selected) - [ ] 202205 - [ ] 202211 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [x] 202505 #### Tested branch (Please provide the tested image version) - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog #### Link to config_db schema for YANG module changes #### A picture of a cute animal (not mandatory but encouraged)
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
1161ed8 to
6e24f53
Compare
Collaborator
Author
|
/azp run |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
6e24f53 to
9dadc1b
Compare
Collaborator
Author
|
/azp run |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
prabhataravind
approved these changes
Sep 16, 2025
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
bingwang-ms
pushed a commit
that referenced
this pull request
Jan 16, 2026
…tically (#23334) #### Why I did it src/sonic-sairedis ``` * 7c435771 - (HEAD -> master, origin/master, origin/HEAD) Add missing <array> include to TestSyncdBrcm.cpp (#1632) (2 days ago) [Saikrishna Arcot] * 80daaa3d - Support for platforms based on Clounix net device (#1618) (2 days ago) [LongWuuu] * d5a9128a - Ignore SAI_TUNNEL_ATTR_ENCAP_TTL_MODE not implemented error during 202411->202505 warm-upgrade (#1644) (4 days ago) [Ryangwaite] * 803973ab - Revert "update docker sonic test (#1639)" (#1643) (7 days ago) [jingwenxie] * a600170d - update docker sonic test (#1639) (2 weeks ago) [jingwenxie] * 3217d783 - Update SAI to include macsec POST API headers (#1628) (3 weeks ago) [senthil-nexthop] * d500ae72 - [trim]: Add Packet Trimming Drop Counters to VS lib (#1630) (3 weeks ago) [Nazarii Hnydyn] * 465bdced - VPP: Update UN_PERF to UN. (#1634) (4 weeks ago) [dypet] * 0b8ccb1a - [Xsight] update config_syncd_xsight() (#1607) (5 weeks ago) [Eran Dahan] * 4a96de71 - Temp workaround for sonic-buildimage issue 23387 (#1629) (5 weeks ago) [veronica-arista] * 2e9c8563 - Use container registry when running tests (#1635) (5 weeks ago) [Saikrishna Arcot] * ed738699 - Updated SAI version to 1.16.3. (#1631) (5 weeks ago) [mramezani95] * dcf7573f - Allow missing SAI_MY_SID_ENTRY_ATTR_ENDPOINT_BEHAVIOR_FLAVOR. (#1597) (5 weeks ago) [dypet] * 5bf346fe - fix the BFD tests for VPP (#1617) (5 weeks ago) [aronovic] * 7bb53263 - (origin/sai_query_stats_st_capability) Exclude sonic-vpp sai code from code coverage check (#1622) (6 weeks ago) [yue-fred-gao] * fb5652bd - [meta] do not fail bulk operations if MODE_IGNORE_ERROR (#1613) (6 weeks ago) [Nikola Dancejic] ``` #### How I did it #### How to verify it #### Description for the changelog
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
3 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.