[code sync] Merge code from sonic-net/sonic-buildimage:202505 to 202506#1651
Merged
prabhataravind merged 4 commits intoAzure:202506from Sep 24, 2025
Merged
Conversation
Collaborator
mssonicbld
commented
Sep 24, 2025
mssonicbld
commented
… PFC pause frames (#24057) Cherry-pick from #23772 Why I did it This PR is to set sai_stats_support_mask to 0x880 for a series of Arista HWSKUs. Work item tracking Microsoft ADO 34515971: CSP CS00012419125 How I did it Update config.bcm How to verify it The change is verified by running PFCWD test on a physical testbed. Tested branch (Please provide the tested image version) Description for the changelog Set sai_stats_support_mask to 0x480 for a series of Arista HWSKUs. signed-off-by: [email protected]
…nfigured (#24024) <!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log skip_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 Need to improve logic where the system decides to start Dual-ToR or not ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it In [mux.service.j2](https://github.com/sonic-net/sonic-buildimage/blob/master/files/build_templates/mux.service.j2) we have a few scripts that are executed before starting the mux container (ExecStartPre): ``` [Service] TimeoutStartSec=180 User={{ sonicadmin_user }} ExecStartPre=/usr/local/bin/write_standby.py ExecStartPre=/usr/local/bin/mark_dhcp_packet.py ExecStartPre=/usr/bin/{{docker_container_name}}.sh start ExecStart=/usr/bin/{{docker_container_name}}.sh wait ``` If any of ExecStartPre scripts have a non-zero exit code mux.sh will not start. But currently, we always return 0. The suggestion is to exit with code 1 when the system is not configured with Dual-ToR sybtype in DEVICE_METADATA [write_standby.py#L85 ](https://github.com/sonic-net/sonic-buildimage/blob/master/files/scripts/write_standby.py#L85). #### How to verify it 1. Config switch with Dual-ToR config 2. make sure mux docker up and running 3. remove "subtype": "DualToR" from DEVICE_METADATA 4. config reload -y ===> mux docker is down <!-- 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 - [ ] 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: --> <!-- 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)
<!-- 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 Currently there is no tunnel being created when more than 128 addresses in the system. This PR enables for loopback addresses in this scenario as it's still needed. ##### Work item tracking - Microsoft ADO **34827134**: #### How I did it Update the tunnel address to include loopback IPv4 and IPv6 addresses. #### 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 - [ ] 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 --> 202412 #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- 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). |
prabhataravind
approved these changes
Sep 24, 2025
vivekrnv
pushed a commit
to vivekrnv/sonic-buildimage-msft
that referenced
this pull request
Sep 24, 2025
…tically (#23830) #### Why I did it src/sonic-sairedis ``` * f32256ec - (HEAD -> 202505, origin/202505) Ignore SAI_TUNNEL_ATTR_ENCAP_TTL_MODE not implemented error during 202411->202505 warm-upgrade (Azure#1651) (5 days ago) [mssonicbld] ``` #### 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.