[202412] Code sync sonic-net/sonic-buildimage:202411 => 202412#1159
Merged
r12f merged 14 commits intoAzure:202412from Jun 12, 2025
Merged
[202412] Code sync sonic-net/sonic-buildimage:202411 => 202412#1159r12f merged 14 commits intoAzure:202412from
r12f merged 14 commits intoAzure:202412from
Conversation
[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)
bingwang-ms
approved these changes
May 24, 2025
[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)
…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
Author
|
/azp run Azure.sonic-buildimage-msft.PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
mssonicbld
added a commit
that referenced
this pull request
Jun 13, 2025
…03 (#1235) ```<br>* aa74696 - (HEAD -> 202503) Merge branch '202412' of https://github.com/Azure/sonic-buildimage-msft into 202503 (2025-06-13) [Sonic Automation] * 9fa6edd - (origin/202412, 202412) [action] [PR:22588] skip frr_bmp container from monit (#1212) (2025-06-12) [mssonicbld] * 70de857 - [submodule][202412] Update submodule sonic-sairedis to the latest HEAD automatically (#1214) (2025-06-12) [mssonicbld] * f3d9c03 - [action] [PR:22673] Add qos values for Arista-7060X6-16PE-384C-O128S2 TH5-512 (#1224) (2025-06-12) [mssonicbld] * c20f188 - Add qos values for Arista-7060X6-16PE-384C-O128S2 TH5-512 (#1220) (2025-06-12) [rick-arista] * 07dbeed - [FRR]: Fix SRv6 static SIDs delete crash (#1200) (2025-06-12) [Riff] |\ | failure_prs.log skip_prs.log 2d5e52b - Merge branch '202412' into fix/fix_srv6_static_sids_crash_202412 (2025-06-10) [Carmine Scarpitta] | failure_prs.log skip_prs.log 26e0868 - Merge branch '202412' into fix/fix_srv6_static_sids_crash_202412 (2025-06-05) [Carmine Scarpitta] | failure_prs.log skip_prs.log 1b90ab9 - Address review comments (2025-06-05) [Carmine Scarpitta] | failure_prs.log skip_prs.log cb402c7 - [FRR]: Fix SRv6 static SIDs delete crash (2025-06-04) [Carmine Scarpitta] * 053f8ac - [202412] Code sync sonic-net/sonic-buildimage:202411 => 202412 (#1159) (2025-06-12) [Riff] |\ | failure_prs.log skip_prs.log 8cd8a28 - Merge remote-tracking branch 'base/202411' into code-sync-202412 (2025-06-10) [r12f] | failure_prs.log skip_prs.log 81dd34b - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#22883) (2025-06-08) [mssonicbld] | failure_prs.log skip_prs.log 66690b6 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#22857) (2025-06-06) [mssonicbld] | failure_prs.log skip_prs.log 221fdba - [submodule] Update submodule sonic-swss-common to the latest HEAD automatically (#22858) (2025-06-06) [mssonicbld] | failure_prs.log skip_prs.log 928671d - switch to use host syslog to for openbmp logging (#22817) (2025-06-03) [mssonicbld] | failure_prs.log skip_prs.log f212bcd - Adding default QoS configurations for Arista-7050CX3-32S-C28S4. (#22744) (2025-05-31) [mssonicbld] | failure_prs.log skip_prs.log e060bb6 - [submodule] Update submodule sonic-gnmi to the latest HEAD automatically (#22740) (2025-05-29) [mssonicbld] | failure_prs.log skip_prs.log 6cfffb6 - [submodule] Update submodule sonic-linux-kernel to the latest HEAD automatically (#22290) (2025-05-25) [mssonicbld] | failure_prs.log skip_prs.log c4fef0a - skip frr_bmp container from monit (#22603) (2025-05-25) [mssonicbld] | failure_prs.log skip_prs.log 3a9d5bc - [build] Upgrade natsort pypi package from 6.2.1 to 8.4.0 (#22609) (2025-05-24) [Liu Shilong] | failure_prs.log skip_prs.log 683b336 - Bump up /dev/shm size for Broadcom platforms to 512MB by default (#22547) (2025-05-23) [mssonicbld] | failure_prs.log skip_prs.log fb14505 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#22636) (2025-05-22) [mssonicbld] | failure_prs.log skip_prs.log 78d363b - [resolv-config] Improve container resolv.conf update mechanism (#22462) (2025-05-15) [mssonicbld] | failure_prs.log skip_prs.log e87edda - Override PTF_IMAGE_TAG for release branch [202411] (#22585) (2025-05-13) [Sai Kiran] * 8081aec - Fix info and order of components for 7060x6_64pe_b (#1231) (2025-06-12) [Ryan Garofano]<br>```
liushilongbuaa
pushed a commit
that referenced
this pull request
Mar 25, 2026
…omatically (#26261) #### Why I did it src/sonic-swss-common ``` * 1e0584c - (HEAD -> master, origin/master, origin/HEAD) Adding zmqclient to swig file. (#1159) (8 hours ago) [divyagayathri-hcl] ``` #### 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
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.
Code sync sonic-net/sonic-buildimage:202411 => 202412