Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:master to kubesonic - #3565

Merged
mssonicbld merged 13 commits into
Azure:kubesonicfrom
mssonicbld:sonicbld/kubesonic-merge
Nov 12, 2026
Merged

mssonicbld merged 13 commits into
Azure:kubesonicfrom
mssonicbld:sonicbld/kubesonic-merge

Conversation

@mssonicbld

Copy link
Copy Markdown
Collaborator
* 73a8b0bab9 - (head/master) [submodule] Update submodule sonic-linux-kernel to the latest HEAD automatically (#30592) (2026-11-12) [mssonicbld]
* 275a8fe39a - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#30532) (2026-11-12) [mssonicbld]
* 72b8933759 - [arp_update]: Ignore DualToR IPv4 link-local MAC mismatches (2026-11-11) [Lawrence Lee]
* f6d506c29b - [sonic-slave-trixie]: Refresh Python build tools (#30401) (2026-11-12) [Lun Yue]
* 259de483e3 - [Nexthop] Report PSU firmware versions on Nexthop platforms (#30579) (2026-11-11) [antonio-nexthop]
* 094ed3865e - [Nexthop] Improve SW handling of asic reset behaviour (#29674) (2026-11-11) [gordon-nexthop]
* b1c66a6bba - (macsec): persist replay-protect fields on macsec profile add (#30247) (2026-11-11) [saksarav-nokia]
* 88bf43f29f - [sbom] Stop losing extra .deb fragments, and name submodule source repositories (#30389) (2026-11-11) [Brad House - Nexthop]
* bf2d517e52 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#30692) (2026-11-11) [mssonicbld]
* a9a51d633c - [submodule] Update submodule platform/vpp to the latest HEAD automatically (#30691) (2026-11-11) [mssonicbld]
* a41133c339 - [submodule] Update submodule platform/alpinevs to the latest HEAD automatically (#30690) (2026-11-11) [mssonicbld]
* 6f800f3d4f - (head/commit-validation) [sonic-utilities] Add Scapy wheel build dependency (#30614) (2026-11-11) [mssonicbld]<br>```

mssonicbld and others added 13 commits November 11, 2026 14:57
Install the locally built Scapy wheel before building and testing sonic-utilities so the lag_keepalive tests can import it.

Signed-off-by: Elastictest AI Worker <sonicbld@microsoft.com>
…omatically (#30690)

#### Why I did it
platform/alpinevs
```
* 2151a06 - (HEAD -> master, origin/master, origin/HEAD) Update download to accept build number (Azure#64) (8 hours ago) [Sree Iyer]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…cally (#30691)

#### Why I did it
platform/vpp
```
* 7ef12b7 - (HEAD -> master, origin/master, origin/HEAD) Add knob for dropping link local IP (Azure#330) (9 hours ago) [yue-fred-gao]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…lly (#30692)

#### Why I did it
src/sonic-swss
```
* beaa5485 - (HEAD -> master, origin/master, origin/HEAD) [aclorch] Defer ACL counter polling registration until warm boot ends (#5009) (2 hours ago) [Yair Raviv]
* 15193ba5 - [intfsorch][portsorch]: Create a port RIF only after the port has left its VLANs (#5054) (4 hours ago) [Brad House - Nexthop]
* 94ccb5b2 - [fdbsyncd]: Do not log an error for an FDB entry that is already gone (#4992) (4 hours ago) [Brad House - Nexthop]
* ec290232 - [fdborch] Re-add an aged static or remote MAC on its stored bridge port (#4984) (4 hours ago) [Brad House - Nexthop]
* b7b2fa08 - [vxlanorch]: Do not read a VNI from a remote VNI delete (#4966) (4 hours ago) [Brad House - Nexthop]
* 852ab1d7 - [evpnmhorch][l2nhgorch][fdborch]: EVPN multihoming fixes for unsupported DF and bridge port next hop groups, group delete order, and neighbors behind a group (#5021) (4 hours ago) [Brad House - Nexthop]
* 6a4acde2 - [evpnmhorch]: Drop tunnel-terminated BUM on the non-DF, not the DF (#5014) (5 hours ago) [Brad House - Nexthop]
* 8839bbee - [fdborch]: Do not log an error for an aged event on a removed bridge port (#5000) (5 hours ago) [Brad House - Nexthop]
* 872a8372 - [nhgorch]: Move a group's routes before an update replaces its SAI ID (#4969) (5 hours ago) [Brad House - Nexthop]
* 15dfc8aa - [neighsync]: Remove failed neighbor entry when a VLAN neighbor is deleted (#5075) (10 hours ago) [Longxiang Lyu]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…positories (#30389)

Extra and derived .debs get their recipe fragment only from their own
rule, but the main recipe writes them after their prerequisite, so make
could find them up to date and skip it. In two official broadcom builds
28 installer debs lost their fragment and the `sonic` namespace, and
nothing failed.

- Date each main deb's derived and extra debs one second before it, so
  their rules run.
- Emit a COPY_DEB fragment for copied debs.
- List the installer's fixed debs, plus the FIPS installer debs, in
  SONIC_INSTALLER_IMAGE_DEBS, and pass them to build_sbom.py.
- build_sbom.py fails under SBOM_STRICT=y when an installer deb has no
  fragment beside it.
- sbom_fragment.py exits 1 on failure; under SBOM_STRICT=y the recipe
  dates its artifact to the epoch first so a retry rebuilds it.

Only a .deb built from the top of a sonic-net submodule named its
source repository, and url.rstrip(".git") turned sonic-gnmi into
sonic-gnm.

- Strip only a literal .git suffix.
- Every artifact built from a submodule gets a
  pkg:github/<owner>/<repo>@<commit> component with an edge from it.
- sonic:source_deb stays multi-valued through the dedupe, and artifacts
  sort ahead of source components.

Signed-off-by: Brad House <bhouse@nexthop.ai>
* (macsec): persist replay-protect fields on macsec profile add

Signed-off-by: saksarav <sakthivadivu.saravanaraj@nokia.com>

* Fix the PR failure

Signed-off-by: saksarav <sakthivadivu.saravanaraj@nokia.com>

---------

Signed-off-by: saksarav <sakthivadivu.saravanaraj@nokia.com>
* Cache xcvr presence during ASIC power cycle to suppress spurious sff_mgr errors

While the ASIC is powered down, transceiver presence reads are unreliable and
can report transceivers as present, so sff_mgr logs errors for ports whose
state never changed.

Snapshot presence into /var/run/platform_cache/xcvr_presence_cache.yaml before
the power cycle and have Sfp.get_presence() serve the cached value while the
file is fresh, falling back to a live read otherwise.

Signed-off-by: lotus-nexthop <lotus@nexthop.ai>
Co-authored-by: gordon-nexthop <gordon@nexthop.ai>
Signed-off-by: gordon-nexthop <gordon@nexthop.ai>

* Defer the fast-reboot ASIC reset until the driver loads

Signed-off-by: gordon-nexthop <gordon@nexthop.ai>

* Detach the ASIC from pcied while asic_init.sh powercycles it

Signed-off-by: gordon-nexthop <gordon@nexthop.ai>

* Revert "Defer the fast-reboot ASIC reset until the driver loads"

This reverts commit 4b98c9b3a797db120d67d9eca5144ae59faa5014.

Keep this PR to silencing the pcied and xcvrd errors raised while the
ASIC is deliberately powered down; moving the fast-reboot reset is a
separate change.

Signed-off-by: gordon-nexthop <gordon@nexthop.ai>

---------

Signed-off-by: lotus-nexthop <lotus@nexthop.ai>
Signed-off-by: gordon-nexthop <gordon@nexthop.ai>
Co-authored-by: lotus-nexthop <lotus@nexthop.ai>
* [nexthop] Add psu_fw_version helper for PSU firmware versions

Signed-off-by: Antonio Hui <antonio@nexthop.ai>

* [nexthop] Report PSU firmware versions on Nexthop platforms

Signed-off-by: Antonio Hui <antonio@nexthop.ai>

---------

Signed-off-by: Antonio Hui <antonio@nexthop.ai>
* [sonic-slave-trixie]: Refresh vulnerable build tools

Replace Bazelisk's outdated embedded Go through Trixie-specific release
checksums. Update Python build tools and their vendored dependencies in
both native and cross-build environments.

Keep exact versions in the build locks, security floors in the installer,
and existing latest-release and unlocked-upgrade behavior. Leave the
existing CI unchanged.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Lun Yue <17232861+lunyue-ms@users.noreply.github.com>

* [sonic-slave-trixie]: Drop duplicate web locks

Inherit Bazelisk checksums already present in the default web lock.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Lun Yue <17232861+lunyue-ms@users.noreply.github.com>

* [docker-ptf]: Support flat saithrift clients

Setuptools 81 no longer installs the SAI client as a legacy egg. Copy flat clients and their metadata into the private venv while preserving dynamic egg lookup and the existing import check.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Lun Yue <17232861+lunyue-ms@users.noreply.github.com>

* [build]: Preserve setuptools packaging compatibility

Replace Debian-only install-layout flags with explicit Debian library paths for VS and Nexthop. Link flat SAI clients into the PTF venv so package replacements are visible while retaining dynamic legacy egg lookup.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Lun Yue <17232861+lunyue-ms@users.noreply.github.com>

* [build]: Complete upstream setuptools install layout migration

Replace Debian-only installation arguments in the remaining active Python 3 platform recipes and Thrift 0.14.1 packaging. Preserve the existing system library paths and the Pensando /usr/local prefix. Leave Python 2 and disabled platform recipes unchanged.

Signed-off-by: Lun Yue <17232861+lunyue-ms@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Signed-off-by: Lun Yue <17232861+lunyue-ms@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
[arp_update]: Ignore DualToR IPv4 link-local MAC mismatches
…atically (#30532)

#### Why I did it
src/sonic-utilities
```
* 92b25124 - (HEAD -> master, origin/master, origin/HEAD) [config] Preserve interface-name case for BGP shutdown and startup (#5022) (5 hours ago) [Fajunzhang]
* db90f89b - [tests] Explicitly Declare Scapy as a test dependency (#5036) (8 hours ago) [Ryangwaite]
* fb5ab6fa - [techsupport] Do not run the BMC debug log dump in noop mode (#4970) (4 days ago) [Nikolay Mirin]
* 85c2ab28 - fast-reboot: remove Nephos module shutdown (#4893) (4 days ago) [Zaahir Ahmed Syed]
* 2413304d - [sonic-installer] Prune stale UEFI Secure Boot db certificates on image removal (#4701) (4 days ago) [elybarneams]
* 9610c685 - Remove unsupported Quagga routing paths (#4993) (4 days ago) [Ashutosh Agrawal]
* fe8b97aa - utilities: support cisco ASIC name (#4717) (5 days ago) [Anand Mehra]
* 2ee0088c - [warm-reboot]: Preserve negotiated LACP retry counts during shutdown (#4960) (5 days ago) [Ryangwaite]
* 01562d04 - Avoid duplicate chrony restarts for NTP server updates (#5017) (6 days ago) [mssonicbld]
* 1da3490c - [ci]: Replace injected diff coverage with pipeline-owned checks (#5019) (7 days ago) [yijingyan2]
* 01c2e89e - Add Major system leak support - sonicBMC (#4860) (7 days ago) [judyjoseph]
* 3ad9388b - [smartswitch] Fix DPU HALT completion detection (#4988) (7 days ago) [Dawei Huang]
* dabd22bb - [fdbshow] Treat an all-zero endpoint address as no endpoint (#4916) (7 days ago) [Brad House - Nexthop]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…tomatically (#30592)

#### Why I did it
src/sonic-linux-kernel
```
* 153314c - (HEAD -> master, origin/master, origin/HEAD) [aspeed][Nexthop] B27: name the leak-fault GPIO lines and drop their input hogs (Azure#650) (3 hours ago) [parvathi-nexthop]
* 967f220 - config.sonic-aspeed: align three loose lines with the BMC block (Azure#642) (4 days ago) [William Tsai]
* 5c30a76 - [aspeed][Nexthop] B27: bind SPI0 to spi_aspeed_txrx only, drop SMC fallback compatible (Azure#648) (4 days ago) [parvathi-nexthop]
* 901fd1d - PCI: Stop waiting for link status after config read failure (Azure#645) (4 days ago) [Yury Murashka]
```
#### How I did it
#### How to verify it
#### Description for the changelog
@azure-pipelines

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

@mssonicbld

Copy link
Copy Markdown
Collaborator Author

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
1 pipeline(s) were filtered out due to trigger conditions.

@mssonicbld
mssonicbld merged commit 519c627 into Azure:kubesonic Nov 12, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants