[code sync] Merge code from sonic-net/sonic-buildimage:202511 to 202603 by mssonicbld · Pull Request #3499 · Azure/sonic-buildimage-msft

mssonicbld · 2026-10-31T03:03:14Z

* bbfe77524e - (head/202511) [202511][Broadcom][SAI] Upgrade Broadcom XGS SAI 14.3.0.0.0.0.35.0 -> 14.3.0.0.0.0.41.1 (#29960) (2026-10-30) [aaronber0614]
* d5616e11b7 - [202511] Add capability to read device type from device description file (#30279) (2026-10-30) [Tejaswini Chadaga]<br>```

…ile (#30279) * Add capability to read device type from device description file Signed-off-by: Tejaswini Chadaga <tchadaga@microsoft.com> * Adding UT Signed-off-by: Tejaswini Chadaga <tchadaga@microsoft.com> --------- Signed-off-by: Tejaswini Chadaga <tchadaga@microsoft.com>

… 14.3.0.0.0.0.41.1 (#29960) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 13abff6a-6f56-4bc8-b9e5-d33e23aec40c

azure-pipelines · 2026-10-31T03:03:23Z

Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run.

mssonicbld · 2026-10-31T03:03:32Z

/azp run

azure-pipelines · 2026-10-31T03:03:45Z

Azure Pipelines: Successfully started running 1 pipeline(s).

[202511] Upgrade docker-ptf package versions

[202511] Upgrade SONiC package Versions

mssonicbld · 2026-11-01T03:03:31Z

/azp run

azure-pipelines · 2026-11-01T03:03:44Z

Azure Pipelines: Successfully started running 1 pipeline(s).

…tically (#30477) #### Why I did it src/sonic-sairedis ``` * 4a595359 - (HEAD -> 202511, origin/202511) [202511][Flexcounter] Poll only initialized PHY/Serdes attributes (Azure#2153) (20 hours ago) [Mark Xiao] ``` #### How I did it #### How to verify it #### Description for the changelog

mssonicbld · 2026-11-02T03:02:48Z

/azp run

azure-pipelines · 2026-11-02T03:03:01Z

Azure Pipelines: Successfully started running 1 pipeline(s).

mssonicbld · 2026-11-03T03:03:57Z

/azp run

azure-pipelines · 2026-11-03T03:04:10Z

Azure Pipelines: Successfully started running 1 pipeline(s).

[202511] Upgrade docker-ptf package versions

#### Why I did it Thrift 0.11 packaging provisions PHP bindings that are not consumed by the SONiC build. Slave templates also install dedicated PHP tools. ##### Work item tracking - Microsoft ADO **(number only)**: N/A #### How I did it Disable the Thrift PHP binding and extension in the Debian source patch, drop its package stanza, install manifest, build dependencies, and packaging helper. Remove explicit PHP tool installs from six slave templates, including `php5-dev` in Jessie. Leave Python 2 dependencies unchanged because their other consumers have not been ruled out. #### How to verify it - Built Thrift 0.11.0-4 binary Debian packages in a local Buster container with `DEB_BUILD_OPTIONS=nocheck`; build passed and the resulting packages contain no PHP package or PHP files. - Ran the Thrift C++ `UnitTests` binary in a Buster container against the built library: 53 cases passed. - Rendered Bookworm and Trixie templates in arm64 cross-build mode; no explicit `phpunit` or `pkg-php-tools` remained. Cross-build images were not built. - A Trixie slave image built through the Docker steps and was saved with a 65-layer manifest; export/unpack was canceled under disk pressure. Its saved image `dpkg/status` layers contained zero installed package names with `php` or `composer`. A runtime container inventory was not performed. - Reviewed patch applicability and Debian build dependencies under default, `nocheck`, and `cross,nocheck` profiles. A full SONiC image build was not run. #### Which release branch to backport (provide reason below if selected) Backport to 202511 and 202605: both release heads still build Thrift 0.11.0-4 and explicitly install the PHP tools removed here. There is no upstream 202512 release branch as of 2026-11-03. - [x] 202511 - [x] 202605 Tracking issue/work item for backport/cherry-pick request (GitHub issue or Microsoft ADO): Not provided. Failure type: other #### Tested branch - [x] master - [x] 202511 - [x] 202605 #### Test result 202511: On release tip `1354e0ce4`, locally cherry-picked PR commits `81abdb82b0` then `433318c169` in an isolated sparse clone. Both commands exited 0 without conflicts; the resulting commits were `252688eda` and `f9f538690`. Cherry-pick log summary: `Auto-merging sonic-slave-bookworm/Dockerfile.j2`, `Auto-merging sonic-slave-trixie/Dockerfile.j2`, followed by `[detached HEAD f9f538690] [sonic-slave]: Retain Python 2 cross-build dependency`. This checks cherry-pick applicability only; no release package/image build or image version tested. 202605: On release tip `4f9e9ed597`, locally cherry-picked PR commits `81abdb82b0` then `433318c169` in the same isolated sparse clone after resetting to that release tip. Both commands exited 0 without conflicts; the resulting commits were `44b7fc5fb` and `c44a0d583`. Cherry-pick log summary: `Auto-merging sonic-slave-bookworm/Dockerfile.j2`, `Auto-merging sonic-slave-trixie/Dockerfile.j2`, followed by `[detached HEAD c44a0d583] [sonic-slave]: Retain Python 2 cross-build dependency`. The net diff contains no `libpython2.7-dev` change. This checks cherry-pick applicability only; no release package/image build or image version tested. master: Local Thrift 0.11.0-4 package build passed; 53 C++ unit cases passed; Bookworm/Trixie cross-template render checks passed. No tested SONiC image version. #### Description for the changelog Remove unused PHP Thrift packaging and dedicated PHP slave-build dependencies. #### Link to config_db schema for YANG module changes N/A #### A picture of a cute animal (not mandatory but encouraged) N/A Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>

mssonicbld · 2026-11-04T03:03:13Z

/azp run

azure-pipelines · 2026-11-04T03:03:26Z

Azure Pipelines: Successfully started running 1 pipeline(s).

mssonicbld · 2026-11-04T19:15:50Z

This cherry pick PR has been opened for more than 3 days. The mssonicbld will attempt to retry.

_{---Powered by SONiC BuildBot}

mssonicbld · 2026-11-04T19:15:52Z

/azpw retry

mssonicbld · 2026-11-04T19:15:55Z

Retrying failed(or canceled) jobs...

mssonicbld · 2026-11-04T19:15:58Z

Retrying failed(or canceled) stages in build 1266719:

✅Stage Test:

Job impacted-area-kvmtest-t0 by Elastictest: retried.

mssonicbld · 2026-11-05T03:03:12Z

/azp run

azure-pipelines · 2026-11-05T03:03:25Z

Azure Pipelines: Successfully started running 1 pipeline(s).

[202511] Upgrade docker-ptf package versions

mssonicbld · 2026-11-06T03:03:22Z

/azp run

azure-pipelines · 2026-11-06T03:03:34Z

Azure Pipelines: Successfully started running 1 pipeline(s).

mssonicbld · 2026-11-07T03:03:19Z

/azp run

azure-pipelines · 2026-11-07T03:03:32Z

Azure Pipelines: Successfully started running 1 pipeline(s).

[202511] Upgrade SONiC package Versions

mssonicbld · 2026-11-08T03:03:06Z

/azp run

azure-pipelines · 2026-11-08T03:03:18Z

Azure Pipelines: Successfully started running 1 pipeline(s).

[202511] Upgrade docker-ptf package versions

mssonicbld · 2026-11-09T03:03:05Z

/azp run

azure-pipelines · 2026-11-09T03:03:17Z

Azure Pipelines: Successfully started running 1 pipeline(s).

#### Why I did it Aimed at #25142 pmon runs against a fixed --device list captured at 'docker create', which breaks in two ways: a block-device partition (e.g. sda1) named in kernel probe order can disappear after a disk reorder and fail 'docker start', and a bus node that appears after create (i2c/cpld/fpga/ipmi/uio/spidev/gpiochip/mtd) is denied and invisible to the container. #### How I did it Pass reorder-invariant whole disks, pre-authorize the hot-plug device classes, and keep the container's /dev in sync at runtime. The change is strictly narrower than --privileged. files/build_templates/docker_image_ctl.j2 - get_pmon_device_mounts(): skip block-device partitions and pass the reorder-invariant whole disk instead. - get_pmon_device_cgroup_rules() (new): emit 'c <major>:* rwm' for each hot-pluggable bus class so a sibling created after 'docker create' (e.g. an i2c bus behind a mux on optic insert) is already permitted. - start(): pass those rules as --device-cgroup-rule on docker create. - postStartAction(): call pmon-dev-bridge.sh resync to converge /dev. files/image_config/pmon/pmon-dev-bridge.sh (new) - Helper that mirrors allowed character bus nodes into the running pmon container(s): 'resync' converges every allowed node on start; 'event add|remove' handles a single udev hot-plug event via mknod/rm. files/image_config/udev/rules.d/99-pmon-dev-bridge.rules (new) - udev rule forwarding add/remove uevents to pmon-dev-bridge.sh so the container's device view tracks hot-plug after creation. files/build_templates/sonic_debian_extension.j2 - Install pmon-dev-bridge.sh to /usr/local/bin (mode 755) at image build time. #### How to verify it All checks are read-only except the dynamic-bridge demonstration, which is **container-only and fully reversible** — the host `/dev` is never modified. Run on a device built from / flashed with this fix. Results: [pmon-how-to-verify-it.md](https://github.com/user-attachments/files/28871000/pmon-how-to-verify-it.md). [PMON-HOTPLUG-TEST-REPORT.md](https://github.com/user-attachments/files/29029346/PMON-HOTPLUG-TEST-REPORT.md)  #### Which release branch to backport (provide reason below if selected)  - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 - [x] 202511 - [x] 202605 #### Tested branch (Please provide the tested image version)  - [x] masterI20260609135544_asrinivasan - [x] SONiC.hpe_202605.0-dirty-20260721.170244 - logs: [pmon-start-issue-logs-202605.txt](https://github.com/user-attachments/files/30248975/pmon-start-issue-logs-202605.txt), [pmon-cgroup-all-char-logs-202605.txt](https://github.com/user-attachments/files/30300120/pmon-cgroup-all-char-logs-202605.txt) and [pmon-cgroup-scoped-logs-202605.txt](https://github.com/user-attachments/files/30765895/pmon-cgroup-scoped-logs-202605.txt) #### Description for the changelog pmon: tolerate /dev reordering and bus hot-plug (fixes #25142) Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>

mssonicbld · 2026-11-10T03:03:50Z

/azp run

azure-pipelines · 2026-11-10T03:04:02Z

Azure Pipelines: Successfully started running 1 pipeline(s).

…atically (#30673) #### Why I did it src/sonic-utilities ``` * 61e324d0 - (HEAD -> 202511, origin/202511) [action] [PR:4995] [portstat]: Count ingress buffer drops in Overruns Received (#5035) (8 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog

[202511] Upgrade docker-ptf package versions

mssonicbld · 2026-11-11T03:02:46Z

/azp run

azure-pipelines · 2026-11-11T03:02:58Z

Azure Pipelines: Successfully started running 1 pipeline(s).

…into 202603

mssonicbld · 2026-11-12T03:03:27Z

/azp run

azure-pipelines · 2026-11-12T03:03:40Z

Azure Pipelines: Successfully started running 1 pipeline(s).

Tejaswini Chadaga (tjchadaga) and others added 2 commits October 30, 2026 13:17

[202511][Broadcom][SAI] Upgrade Broadcom XGS SAI 14.3.0.0.0.0.35.0 ->…

bbfe775

… 14.3.0.0.0.0.41.1 (#29960) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 13abff6a-6f56-4bc8-b9e5-d33e23aec40c

mssonicbld added the automerge label Oct 31, 2026

mssonicbld added 2 commits October 31, 2026 06:12

[docker-ptf] Upgrade docker-ptf package versions (#30471)

5dbc2af

[202511] Upgrade docker-ptf package versions

[ci/build]: Upgrade SONiC package versions (#30472)

b86ab2f

[202511] Upgrade SONiC package Versions

mssonicbld force-pushed the sonicbld/202603-merge branch from d75028d to dcd10ee Compare November 1, 2026 03:03

mssonicbld force-pushed the sonicbld/202603-merge branch from dcd10ee to dd70ac4 Compare November 2, 2026 03:02

mssonicbld force-pushed the sonicbld/202603-merge branch from dd70ac4 to 178c07a Compare November 3, 2026 03:03

mssonicbld added 2 commits November 3, 2026 20:12

[docker-ptf] Upgrade docker-ptf package versions (#30490)

0f50771

[202511] Upgrade docker-ptf package versions

mssonicbld force-pushed the sonicbld/202603-merge branch from 178c07a to 9e375ca Compare November 4, 2026 03:02

mssonicbld force-pushed the sonicbld/202603-merge branch from 9e375ca to d9c1fc2 Compare November 5, 2026 03:02

[docker-ptf] Upgrade docker-ptf package versions (#30551)

270c382

[202511] Upgrade docker-ptf package versions

mssonicbld force-pushed the sonicbld/202603-merge branch from d9c1fc2 to 9e2225e Compare November 6, 2026 03:03

mssonicbld force-pushed the sonicbld/202603-merge branch from 9e2225e to 7340dee Compare November 7, 2026 03:03

[ci/build]: Upgrade SONiC package versions (#30596)

c84b322

[202511] Upgrade SONiC package Versions

mssonicbld force-pushed the sonicbld/202603-merge branch from 7340dee to f9be4bd Compare November 8, 2026 03:02

[docker-ptf] Upgrade docker-ptf package versions (#30598)

00f4741

[202511] Upgrade docker-ptf package versions

mssonicbld force-pushed the sonicbld/202603-merge branch from f9be4bd to e53297f Compare November 9, 2026 03:02

mssonicbld force-pushed the sonicbld/202603-merge branch from e53297f to 7e03456 Compare November 10, 2026 03:03

mssonicbld added 2 commits November 10, 2026 21:13

[docker-ptf] Upgrade docker-ptf package versions (#30613)

811b570

[202511] Upgrade docker-ptf package versions

mssonicbld force-pushed the sonicbld/202603-merge branch from 7e03456 to a749b2e Compare November 11, 2026 03:02

Merge branch '202511' of https://github.com/sonic-net/sonic-buildimage …

12dd834

…into 202603

mssonicbld force-pushed the sonicbld/202603-merge branch from a749b2e to 12dd834 Compare November 12, 2026 03:03

Conversation

mssonicbld commented Oct 31, 2026

Uh oh!

azure-pipelines Bot commented Oct 31, 2026

Uh oh!

mssonicbld commented Oct 31, 2026

Uh oh!

azure-pipelines Bot commented Oct 31, 2026

Uh oh!

mssonicbld commented Nov 1, 2026

Uh oh!

azure-pipelines Bot commented Nov 1, 2026

Uh oh!

mssonicbld commented Nov 2, 2026

Uh oh!

azure-pipelines Bot commented Nov 2, 2026

Uh oh!

mssonicbld commented Nov 3, 2026

Uh oh!

azure-pipelines Bot commented Nov 3, 2026

Uh oh!

mssonicbld commented Nov 4, 2026

Uh oh!

azure-pipelines Bot commented Nov 4, 2026

Uh oh!

mssonicbld commented Nov 4, 2026

Uh oh!

mssonicbld commented Nov 4, 2026

Uh oh!

mssonicbld commented Nov 4, 2026

Uh oh!

mssonicbld commented Nov 4, 2026

Uh oh!

mssonicbld commented Nov 5, 2026

Uh oh!

azure-pipelines Bot commented Nov 5, 2026

Uh oh!

mssonicbld commented Nov 6, 2026

Uh oh!

azure-pipelines Bot commented Nov 6, 2026

Uh oh!

mssonicbld commented Nov 7, 2026

Uh oh!

azure-pipelines Bot commented Nov 7, 2026

Uh oh!

mssonicbld commented Nov 8, 2026

Uh oh!

azure-pipelines Bot commented Nov 8, 2026

Uh oh!

mssonicbld commented Nov 9, 2026

Uh oh!

azure-pipelines Bot commented Nov 9, 2026

Uh oh!

mssonicbld commented Nov 10, 2026

Uh oh!

azure-pipelines Bot commented Nov 10, 2026

Uh oh!

mssonicbld commented Nov 11, 2026

Uh oh!

azure-pipelines Bot commented Nov 11, 2026

Uh oh!

mssonicbld commented Nov 12, 2026

Uh oh!

azure-pipelines Bot commented Nov 12, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants