Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202411 to 202412 #893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mssonicbld merged 20 commits into from
Mar 15, 2025
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202411 to 202412 #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a414a7f
[submodule] Update submodule sonic-swss to the latest HEAD automatica…
mssonicbld Mar 7, 2025
e1be5dd
Update cisco-8000.ini
Aravind-Subbaroyan Mar 8, 2025
37df4a3
[submodule] Update submodule sonic-utilities to the latest HEAD autom…
mssonicbld Mar 8, 2025
5e6a202
Merge pull request #21964 from Aravind-Subbaroyan/patch-5
kperumalbfn Mar 11, 2025
39dbcfd
[SNMP] Fix config template issue when setting snmpagentaddress (#21987)
mssonicbld Mar 11, 2025
ef9e911
[Mellanox] Support new field "supporting_bulk_counter_groups" in DEVI…
mssonicbld Mar 11, 2025
6cb2941
[YANG] Add yang model to `SUBNET_DECAP` table (#21118) (#21974)
lolyu Mar 11, 2025
ad28af8
[submodule] Update submodule sonic-utilities to the latest HEAD autom…
mssonicbld Mar 11, 2025
c371cd3
[202411]Upgrade SONiC package versions (#21971)
mssonicbld Mar 12, 2025
be28041
Use pzstd to compress the Docker in SWI slim images (#22005)
mssonicbld Mar 12, 2025
c807b26
Build fix for ptf-py3 issue on bullseye (#21925)
mssonicbld Mar 12, 2025
3283497
[Nokia-7215-A1] Update EZB files for SAI 15.1 (#22004)
mssonicbld Mar 12, 2025
9072445
[rsyslog]: Remote logging with the highest rule priority (#22020)
mssonicbld Mar 13, 2025
8a3dff1
[submodule] Update submodule sonic-utilities to the latest HEAD autom…
mssonicbld Mar 13, 2025
54b0e3b
[202411] [Marvell-teralynx] Correction ISAI debian path (#22032)
Keshavg-marvell Mar 13, 2025
49146b8
[submodule] Update submodule sonic-sairedis to the latest HEAD automa…
mssonicbld Mar 13, 2025
f88aa3a
[dualtor] Fix `mux` start failure due to pre operation timeout (#22027)
mssonicbld Mar 14, 2025
b7f0ca0
[submodule] Update submodule sonic-utilities to the latest HEAD autom…
mssonicbld Mar 14, 2025
fa9c47b
Upgrade xgs SAI to 12.3.2.3 (#22042)
Gfrom2016 Mar 15, 2025
cc750db
Merge branch '202411' of https://github.com/sonic-net/sonic-buildimag…
mssonicbld Mar 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions files/build_templates/mux.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ StartLimitIntervalSec=1200
StartLimitBurst=3

[Service]
TimeoutStartSec=180
User={{ sonicadmin_user }}
ExecStartPre=/usr/local/bin/write_standby.py
ExecStartPre=/usr/local/bin/mark_dhcp_packet.py
Expand Down
2 changes: 1 addition & 1 deletion files/scripts/write_standby.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def tunnel_exists(self):
tunnel_key_pattern = 'ASIC_STATE:SAI_OBJECT_TYPE_TUNNEL:*'
return len(self.asic_db.keys('ASIC_DB', tunnel_key_pattern)) > 0

def wait_for_tunnel(self, interval=1, timeout=90):
def wait_for_tunnel(self, interval=1, timeout=160):
"""
Waits until the IP-in-IP tunnel has been created

Expand Down
2 changes: 1 addition & 1 deletion platform/broadcom/sai.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LIBSAIBCM_XGS_VERSION = 12.3.2.2
LIBSAIBCM_XGS_VERSION = 12.3.2.3
LIBSAIBCM_DNX_VERSION = 12.3.2.2
LIBSAIBCM_XGS_BRANCH_NAME = SAI_12.3.0_GA
LIBSAIBCM_DNX_BRANCH_NAME = SAI_12.3.0_GA
Expand Down