Skip to content

Commit 123833c

Browse files
mssonicbldmssonicbld
authored
[code sync] Merge code from sonic-net/sonic-buildimage:202411 to 202412 (sonic-net#893)
```<br>* cc750dbc9 - (HEAD -> 202412) Merge branch '202411' of https://github.com/sonic-net/sonic-buildimage into 202412 (2025-03-15) [Sonic Automation] * fa9c47b - (head/202411) Upgrade xgs SAI to 12.3.2.3 (sonic-net#22042) (2025-03-14) [zitingguo-ms] * b7f0ca0 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (sonic-net#22040) (2025-03-14) [mssonicbld] * f88aa3a - [dualtor] Fix `mux` start failure due to pre operation timeout (sonic-net#22027) (2025-03-13) [mssonicbld] * 49146b8 - [submodule] Update submodule sonic-sairedis to the latest HEAD automatically (sonic-net#22024) (2025-03-13) [mssonicbld] * 54b0e3b - [202411] [Marvell-teralynx] Correction ISAI debian path (sonic-net#22032) (2025-03-13) [Keshav Gupta] * 8a3dff1 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (sonic-net#22025) (2025-03-13) [mssonicbld] * 9072445 - [rsyslog]: Remote logging with the highest rule priority (sonic-net#22020) (2025-03-13) [mssonicbld] * 3283497 - [Nokia-7215-A1] Update EZB files for SAI 15.1 (sonic-net#22004) (2025-03-13) [mssonicbld] * c807b26 - Build fix for ptf-py3 issue on bullseye (sonic-net#21925) (2025-03-12) [mssonicbld] * be28041 - Use pzstd to compress the Docker in SWI slim images (sonic-net#22005) (2025-03-12) [mssonicbld] * c371cd3 - [202411]Upgrade SONiC package versions (sonic-net#21971) (2025-03-11) [mssonicbld] * ad28af8 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (sonic-net#21968) (2025-03-11) [mssonicbld] * 6cb2941 - [YANG] Add yang model to `SUBNET_DECAP` table (sonic-net#21118) (sonic-net#21974) (2025-03-11) [Longxiang Lyu] * ef9e911 - [Mellanox] Support new field "supporting_bulk_counter_groups" in DEVICE_METADATA|localhost for Mellanox-SN4280-O28 (sonic-net#21986) (2025-03-11) [mssonicbld] * 39dbcfd - [SNMP] Fix config template issue when setting snmpagentaddress (sonic-net#21987) (2025-03-11) [mssonicbld] * 5e6a202 - Merge pull request sonic-net#21964 from Aravind-Subbaroyan/patch-5 (2025-03-10) [Kumaresh Perumal] |\ | failure_prs.log skip_prs.log e1be5dd - Update cisco-8000.ini (2025-03-07) [Aravind-Subbaroyan] * | 37df4a3 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (sonic-net#21912) (2025-03-08) [mssonicbld] |/ * a414a7f - [submodule] Update submodule sonic-swss to the latest HEAD automatically (sonic-net#21933) (2025-03-08) [mssonicbld]<br>```
1 parent bc1d662 commit 123833c

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

‎files/build_templates/mux.service.j2

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ StartLimitIntervalSec=1200
88
StartLimitBurst=3
99

1010
[Service]
11+
TimeoutStartSec=180
1112
User={{ sonicadmin_user }}
1213
ExecStartPre=/usr/local/bin/write_standby.py
1314
ExecStartPre=/usr/local/bin/mark_dhcp_packet.py

‎files/scripts/write_standby.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ def tunnel_exists(self):
136136
tunnel_key_pattern = 'ASIC_STATE:SAI_OBJECT_TYPE_TUNNEL:*'
137137
return len(self.asic_db.keys('ASIC_DB', tunnel_key_pattern)) > 0
138138

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

‎platform/broadcom/sai.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LIBSAIBCM_XGS_VERSION = 12.3.2.2
1+
LIBSAIBCM_XGS_VERSION = 12.3.2.3
22
LIBSAIBCM_DNX_VERSION = 12.3.2.2
33
LIBSAIBCM_XGS_BRANCH_NAME = SAI_12.3.0_GA
44
LIBSAIBCM_DNX_BRANCH_NAME = SAI_12.3.0_GA

0 commit comments

Comments
 (0)