[code sync] Merge code from sonic-net/sonic-buildimage:202412 to 202503#1235
Merged
mssonicbld merged 26 commits intoAzure:202503from Jun 13, 2025
Merged
[code sync] Merge code from sonic-net/sonic-buildimage:202412 to 202503#1235mssonicbld merged 26 commits intoAzure:202503from
mssonicbld merged 26 commits intoAzure:202503from
Conversation
Collaborator
mssonicbld
commented
Jun 13, 2025
mssonicbld
commented
[202411]Override PTF_IMAGE_TAG for release branch
<!-- 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 Fix a possible race condition during the config reload caused by the concurrent restart of the Docker containers and the resolv-config service. The update of the DNS configuration inside the container is triggered by the container's post-start action. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it - Add support for single container updates with container name argument - Implement parallel updates for bulk operations - Add comprehensive logging with syslog integration - Add container state handling (start/wait for stopped containers) - Add proper error handling and status reporting - Remove temporary file usage during resolv.conf updates - Add networking service check for bulk updates only Integration changes: - Add automatic DNS update call in docker_image_ctl post-start action #### How to verify it Run sonic-mgmt DNS tests <!-- 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 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 #### 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)
…lly (#22636) [submodule] Update submodule sonic-swss to the latest HEAD automatically
…547) <!-- 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 In the case of ASIC detection failures on Broadcom (or if the ASIC couldn't be detected in time), the `/dev/shm` partition in the syncd container will be only 64MB, which might cause issues if syncd/Broadcom SAI library needs more space than that. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Since using a larger `/dev/shm` on its own doesn't cause any issues, bump up the default to 512MB. This should be enough for most platforms. #### 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 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 #### 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)
[build] Upgrade natsort pypi package from 6.2.1 to 8.4.0
<!-- 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 frr_bmp is only feature switch used for bgpd to start as "/usr/lib/frr/bgpd -A 127.0.0.1 -M bmp", so that bmp container later rollout could work, thus is should be skipped from container check. ##### Work item tracking - Microsoft ADO **(number only)**:30807821 #### How I did it skip container check from monit. #### How to verify it before fix  after fix, the error log disappears. <!-- 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 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 #### 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)
…tomatically (#22290) #### Why I did it src/sonic-linux-kernel ``` * a89afbc - (HEAD -> 202411, origin/202411) [202411] Update to Linux 6.1.123 (Azure#459) (4 days ago) [Saikrishna Arcot] ``` #### How I did it #### How to verify it #### Description for the changelog
…lly (#22740) #### Why I did it src/sonic-gnmi ``` * 6c04f75 - (HEAD -> 202411, origin/202411) Update agent-pool to use ubuntu 22.04 (Azure#401) (2 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
<!-- 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 The default QoS configuration for Arista-7050CX3-32S-C28S4 is not added. This change is fixing the issues. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Added the default QoS configurations for Arista-7050CX3-32S-C28S4. #### 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 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 #### 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 openbmp is using dedicated logging now, which has potential log spawn issue ##### Work item tracking - Microsoft ADO **(number only)**: 27588893 #### How I did it switch to use syslog and rotate will be done together with syslog. #### How to verify it verified on device which works fine   <!-- 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 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 #### 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)
Signed-off-by: Carmine Scarpitta <[email protected]>
Signed-off-by: Carmine Scarpitta <[email protected]>
…omatically (#22858) #### Why I did it src/sonic-swss-common ``` * d38e6d9 - (HEAD -> 202411, origin/202411) [build] deprecate ubuntu 20.04 agent pool. (Azure#1021) (9 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
…lly (#22857) #### Why I did it src/sonic-swss ``` * 9c3daaed - (HEAD -> 202411, origin/202411) [202411][muxorch] Catch error when checking active state of missing neighbor (4 minutes ago) [Kumaresh Perumal] |\ | failure_prs.log 0a1e41e1 - [muxorch] Catch error when checking active state of missing neighbor (23 hours ago) [Nikola Dancejic] * cc0255bf - Update swss pipeline to use ubuntu 22.04 agent pool (#3677) (9 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
…lly (#22883) #### Why I did it src/sonic-swss ``` * c238a52a - (HEAD -> 202411, origin/202411) Fix indentation in template file (#3694) (22 hours ago) [mssonicbld] * b12c1285 - [202411][test_mux] fix vstest multi-mux (#3692) (25 hours ago) [Nikola Dancejic] ``` #### How I did it #### How to verify it #### Description for the changelog
#### Why I did it `sonic-mgmt/tests/platform_tests/api/test_component.py` was failing due to an order mismatch between the `platform.json` file and our component API implementation. Since the two are not linked together we need to update the json files with the correct order. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Modified `platform.json` and `platform_components.json` with the correct info and order for the components. #### How to verify it Verified by running `sonic-mgmt/tests/platform_tests/api/test_component.py` with and without the change on a x86_64-arista_7060x6_64pe_b switch. With the change `test_get_name` no longer fails. #### Which release branch to backport (provide reason below if selected) - [ ] 202205 - [ ] 202211 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 - [x] msft-202412 #### 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
…#1159) Code sync sonic-net/sonic-buildimage:202411 => 202412 ``` * 8cd8a28 (HEAD -> code-sync-202412, origin/code-sync-202412) r12f 250610:2321 - Merge remote-tracking branch 'base/202411' into code-sync-202412 |\ | * 81dd34b (base/202411) mssonicbld 250608:1901 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#22883) | * 66690b6 mssonicbld 250606:1001 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#22857) | * 221fdba mssonicbld 250606:1001 - [submodule] Update submodule sonic-swss-common to the latest HEAD automatically (#22858) | * 928671d mssonicbld 250603:1001 - switch to use host syslog to for openbmp logging (#22817) | * f212bcd mssonicbld 250531:1303 - Adding default QoS configurations for Arista-7050CX3-32S-C28S4. (#22744) | * e060bb6 mssonicbld 250529:1009 - [submodule] Update submodule sonic-gnmi to the latest HEAD automatically (#22740) | * 6cfffb6 mssonicbld 250525:2201 - [submodule] Update submodule sonic-linux-kernel to the latest HEAD automatically (#22290) | * c4fef0a mssonicbld 250525:1903 - skip frr_bmp container from monit (#22603) | * 3a9d5bc Liu Shilong 250525:1239 - [build] Upgrade natsort pypi package from 6.2.1 to 8.4.0 (#22609) | * 683b336 mssonicbld 250523:1602 - Bump up /dev/shm size for Broadcom platforms to 512MB by default (#22547) | * fb14505 mssonicbld 250523:0323 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#22636) | * 78d363b mssonicbld 250515:1601 - [resolv-config] Improve container resolv.conf update mechanism (#22462) | * e87edda Sai Kiran 250514:1417 - Override PTF_IMAGE_TAG for release branch [202411] (#22585) ```
This PR fixes a crash that could occur when a SID is removed after the parent locator has already been removed. Fixes: sonic-net/sonic-buildimage#22690
<!--
Please make sure you've read and understood our contributing guidelines:
https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md
** 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
Add qos values for Arista-7060X6-16PE-384C-O128S2 TH5-512
##### Work item tracking
- Microsoft ADO **(number only)**:
#### How I did it
#### 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
-->
- [ ] 201811
- [ ] 201911
- [ ] 202006
- [ ] 202012
- [ ] 202106
- [ ] 202111
- [ ] 202205
- [ ] 202211
#### 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)
… TH5-512 (Azure#1224) <!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md ** 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 Add qos values for Arista-7060X6-16PE-384C-O128S2 TH5-512 ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it #### 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 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 #### 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)
…D automatically (Azure#1214) #### Why I did it src/sonic-sairedis ``` * f21e12c - (HEAD -> 202412, origin/HEAD, origin/202412) [trim]: Add Packet Trimming Port/Queue stats to VS lib (Azure#60) (8 hours ago) [Nazarii Hnydyn] * 9d39644 - Merge pull request Azure#61 from mssonicbld/cherry/msft-202412/1548 (4 days ago) [Ze Gan] * 613654b - [syncd] Move log set function after api initialize (4 days ago) [Sonic Build Admin] ``` #### How I did it #### How to verify it #### Description for the changelog
<!--
Please make sure you've read and understood our contributing guidelines:
https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md
** 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
frr_bmp is only feature switch used for bgpd to start as
"/usr/lib/frr/bgpd -A 127.0.0.1 -M bmp", so that bmp container later
rollout could work, thus is should be skipped from container check.
##### Work item tracking
- Microsoft ADO **(number only)**:30807821
#### How I did it
skip container check from monit.
#### How to verify it
before fix
after fix, the error log disappears.
<!--
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
-->
- [ ] 201811
- [ ] 201911
- [ ] 202006
- [ ] 202012
- [ ] 202106
- [ ] 202111
- [ ] 202205
- [ ] 202211
- [ ] 202305
#### 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)
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
7 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.