Skip to content

[202412] Code sync sonic-net/sonic-buildimage:202411 => 202412#1052

Merged
r12f merged 24 commits intoAzure:202412from
r12f:code-sync-202412
Apr 25, 2025
Merged

[202412] Code sync sonic-net/sonic-buildimage:202411 => 202412#1052
r12f merged 24 commits intoAzure:202412from
r12f:code-sync-202412

Conversation

@r12f
Copy link

@r12f r12f commented Apr 24, 2025

Code sync sonic-net/sonic-buildimage:202411 => 202412

*   903637bbc (HEAD -> code-sync-202412, origin/code-sync-202412) r12f 250424:0714 - Merge remote-tracking branch 'base/202411' into code-sync-202412
|\  
| * 367199f4f (base/202411) mssonicbld 250423:1901 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#22412)
| * 0da8b10e0 mssonicbld 250422:1901 - [submodule] Update submodule sonic-sairedis to the latest HEAD automatically (#22397)
| * 4700d3556 mssonicbld 250418:1901 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#22364)
| * 688b70869 mssonicbld 250418:1901 - [CI]Add a pipeline to generates daily, successful virtual SONiC images (#22368)
| * c70a09c06 mssonicbld 250416:1601 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#22329)
| * 171147551 mssonicbld 250416:0101 - [ci] Stop building slave docker for jessie and march (#22331)
| * 8f4074003 Saikrishna Arcot 250414:1755 - [202411] Update to Linux 6.1.123 (#21736)
| * 2fd97fedd mssonicbld 250411:1902 - [chassis-packet] Allow Fallback Route to get programmed on Downstream LC (#21833)
| * f2a76d592 Volodymyr Samotiy 250410:1845 - [202411][Mellanox] Integrate HW-MGMT Version 7.0040.2207 (#22202)
| * d9fd1317b mssonicbld 250408:0920 - [submodule] Update submodule sonic-gnmi to the latest HEAD automatically (#22258)
| * bbd6e3cda mssonicbld 250407:2200 - extend frr reconnect bmp retry interval from 1-2s into 10-15s. (#22251)
| * 3807de003 Aravind-Subbaroyan 250406:1803 - Update cisco-8000.ini (#22247)
| * bd3a4196b Feng-msft 250407:1038 - Split frr_bmp feature switch for turn on FRR side bmp tunneling via Liquid (#22243)
| * b7545601f mssonicbld 250404:1901 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#22232)
| * fd4d0581c zitingguo-ms 250404:0123 - [Broadcom] Upgrade xgs SAI to 12.3.6.2 (#22219)
| * 6042d69b2 mssonicbld 250404:0020 - [submodule] Update submodule sonic-sairedis to the latest HEAD automatically (#22227)
| * b9a003173 mssonicbld 250404:0020 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#22228)
| * 2bb570aed sschlafman 250403:0854 - [202411] Changed SKU name to Mellanox-SN4280-C48-202411 (#22121)
| * a06b315ee sschlafman 250403:0854 - [202411] Add new T1 Mellanox-SN4280-O8V40 SKU for 202411 (#22108)
| * 692173502 Ying Xie 250403:0716 - [FRR] fix FRR mgmtd losing configuration issue (#22183)
| * f7cbdd927 Stepan Blyshchak 250402:2200 - [orchagent.sh] mask SIGHUP before starting orchagent (#22208)
| * 476532457 sudhanshukumar22 250401:2234 -  [202411][FRR] Port Fix from FRR community for issue #18493
| * 874cbf463 Sai Kiran 250401:1546 - [docker-ptf] Port changes from master (#22185)

opcoder0 and others added 24 commits April 1, 2025 12:46
Why I did it
The release branches use the mixed (Python 2 + Python 3) image. The release branches use latest tag of docker-ptf. The intent is to have release branches have latest changes for docker-ptf so they are built and published from the release branch. As with Python 3 migration for docker-ptf the "latest" tag will contain a Python 3 only image.

Work item tracking
Microsoft ADO (number only): 29869339
How I did it
Port changes relevant for mixed image setting from master.

How to verify it
This will be in another PR to enable branch-based tag for 202411.

Tested branch (Please provide the tested image version)
master

Description for the changelog
[docker-ptf]: Port of latest Dockerfile changes from master

Required to enable branch based docker-ptf tag.
[202411][FRR] Port Fix from FRR community for issue #18493
[202411][orchagent.sh] mask SIGHUP before starting orchagent
[202411][FRR] Fix FRR mgmtd losing configuration issue
[202411] Add new T1 Mellanox-SN4280-O8V40 SKU for 202411
[202411] Changed SKU name to Mellanox-SN4280-C48-202411
…lly (#22228)

src/sonic-swss

* fceb196d - (HEAD -> 202411, origin/202411)  Revert "Optimize counter polling interval by making it more accurate (5 minutes ago) [Kumaresh Perumal]
*   d88b694d - (origin/kperumal/check) Remove unused string variables in flexcounterorch.cpp (17 hours ago) [Kumaresh Perumal]
|\  
| * 1e4315e1 - (origin/kperumalbfn-patch-1) Remove unused string variables in flexcounterorch.cpp (17 hours ago) [Kumaresh Perumal]
|/  
* e82f8c2d - Revert "Optimize counter polling interval by making it more accurate (#3500)" (17 hours ago) [Kumaresh Peruma
…tically (#22227)

src/sonic-sairedis

* 4048483e - (HEAD -> 202411, origin/202411) Revert "Optimize counter polling interval by making it more accurate (Azure#1457)
[202411][Broadcom] Upgrade xgs SAI to 12.3.6.2
…atically (#22232)

#### Why I did it
src/sonic-utilities
```
* a6fcf564 - (HEAD -> 202411, origin/202411) [show][interfaces] Add proposal for show interfaces flap (#3627) (#3823) (8 hours ago) [vdahiya12]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…iquid (#22243)

[202411]Split frr_bmp feature switch for turn on FRR side bmp tunneling via Liquid
Update cisco-8000.ini
<!--
 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
In order to lower risk from FRR side, currently if bmp service is down, FRR will try to reconnect bmp every 2s, update it into 15s instead.
##### Work item tracking
- Microsoft ADO **(number only)**:30807821

#### How I did it
update bgpd config to adjust the by default reconnect interval.

#### How to verify it
lower risk, pre-check verification is good enough.

<!--
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 (#22258)

[submodule] Update submodule sonic-gnmi to the latest HEAD
[202411][Mellanox] Integrate HW-MGMT Version 7.0040.2207
… LC (#21833)

What/Why I did:
Initially I made the change that Fallback Route [routes from AH on Upstream LC] not to get programmed [mark them as deny] on Downstream LC's as reasoning was that on Downstream LC's can forward them based on Default-route. However that assumption is correct for example we have topology like this:

RH is connected to ASIC0 of Upstream LC
AH is connected to ASIC1 of Upstream LC

Downstream LC will learn route from RH [including default-route] and will only forward to ASIC0 of upstream LC . Above assumption was fine if we always have AH and RH connected to same ASIC of Upstream LC.

How I verify:
UT updated
Manual Verification.
[202411] Update to Linux 6.1.123
<!--
 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
Official build stop cross building arm image for a long time.
Now stop building march slave docker and jessie slave docker.
##### Work item tracking
- Microsoft ADO **(number only)**: 32295991

#### 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)
…atically (#22329)

#### Why I did it
src/sonic-utilities
```
* 606a90a7 - (HEAD -> 202411, origin/202411) Fixed syslog error "ERR python3:- validateNamespace: Initialize global.." for sfpshow (#3849) (31 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…s (#22368)

<!--
 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:
-->
[CI]Add a pipeline to generates daily, successful virtual SONiC images

#### Why I did it
Currently, non-build repos such as sonic-mgmt PR testing is downloading vs images from PR build pipeline of sonic-buildimage, it doesn't make sense. This PR introduces a new pipeline yaml to use the merged code to build daily vs images with full tests.

##### Work item tracking
- Microsoft ADO **(32017130)**:

#### How I did it
[CI]Add a pipeline to generates daily, successful virtual SONiC images with full tests.

#### How to verify it
This draft pipeline (https://dev.azure.com/mssonic/build/_build/results?buildId=815418&view=results) is to verify the whole procedure works as expceted.
After merge:
Will set up pipeline (https://dev.azure.com/mssonic/build/_build?definitionId=2925&_a=summary) based on YAML and update sonic-mgmt getbuild script to retrieve successful builds from the new pipeline.

<!--
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 (#22364)

#### Why I did it
src/sonic-swss
```
* 4383d39a - (HEAD -> 202411, origin/202411) Fix the missed port status notifications issue (#3616) (64 minutes ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…tically (#22397)

#### Why I did it
src/sonic-sairedis
```
* 75ded525 - (HEAD -> 202411, origin/202411) [ACL] Enable ACL multi-binding for Dual-ToR setups (Azure#1585) (10 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…lly (#22412)

#### Why I did it
src/sonic-swss
```
* 79f04e32 - (HEAD -> 202411, origin/202411) Initialize the last fec ber computed values if not found (#3621) (19 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
@r12f r12f requested a review from StormLiangMS as a code owner April 24, 2025 07:17
@r12f r12f added the automerge label Apr 24, 2025
@r12f r12f requested a review from lguohan as a code owner April 24, 2025 07:17
@r12f
Copy link
Author

r12f commented Apr 24, 2025

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@r12f r12f merged commit 8dbf5fd into Azure:202412 Apr 25, 2025
14 of 17 checks passed
bingwang-ms pushed a commit that referenced this pull request Jan 16, 2026
…omatically (#23392)

#### Why I did it
src/sonic-swss-common
```
* fc35dd0 - (HEAD -> master, origin/master, origin/HEAD) Move SonicDbTable to sonic-dash-ha. (#1056) (3 hours ago) [dypet]
* 100e2e0 - [MSTP] Schema Support (#961) (5 hours ago) [Wajahat Razi]
* d7c661b - [trim]: Add Packet Trimming Drop Counters DB schema (#1055) (33 hours ago) [Nazarii Hnydyn]
* 465cc1c - Add test case to verify zmq reconnect behaviour (#84) (#1052) (12 days ago) [Qi Luo]
* 93af927 - Move swss-common/swss-common-testing crates from https://github.com/sonic-net/sonic-dash-ha (#1044) (13 days ago) [Qi Luo]
```
#### How I did it
#### How to verify it
#### Description for the changelog
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.