[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#89
Merged
mssonicbld merged 6 commits intoAzure:202205from Aug 26, 2023
Merged
Conversation
Collaborator
mssonicbld
commented
Aug 26, 2023
mssonicbld
commented
…6260) - Why I did it watchdogutil uses platform API watchdog instance to control/query watchdog status. In Nvidia watchdog status, it caches "armed" status in a object member "WatchdogImplBase.armed". This is not working for CLI infrastructure because each CLI will create a new watchdog instance, the status cached in previous instance will totally lose. Consider following commands: admin@sonic:~$ sudo watchdogutil arm -s 100 =====> watchdog instance1, armed=True Watchdog armed for 100 seconds admin@sonic:~$ sudo watchdogutil status ======> watchdog instance2, armed=False Status: Unarmed admin@sonic:~$ sudo watchdogutil disarm =======> watchdog instance3, armed=False Failed to disarm Watchdog - How I did it Use sysfs to query watchdog status - How to verify it Manual test Unit test Conflicts: platform/mellanox/mlnx-platform-api/sonic_platform/watchdog.py platform/mellanox/mlnx-platform-api/tests/test_watchdog.py
…D_ONLY_CMDS in sudoers file (#16258) Cherry-pick PR :#16115
…0) (#16235) How I did it Update Yang definition of IN_PORTS and OUT_PORTS to string. Since we cannot split the string with comma (,) and validate each substring is a valid SONiC port name. The only restriction for them is must be a string. How to verify it Verified by building sonic_yang_models-1.0-py3-none-any.whl. While building the target package, unit tests were run and passed. Build a SONiC image based on 202205 branch and installed on physical DUT. Re try the steps in [Yang] Incorrect definition of IN_PORTS and OUT_PORTS in sonic-acl.yang #16190 and can see below success response: Co-authored-by: Zhijian Li <[email protected]>
Why I did it Dell S6100 Platform components needs to be updated. How I did it Modified platform.json to fix the issue. How to verify it Run sonic-mgmt component test and check whether it passes. Co-authored-by: Aravind Mani <[email protected]>
mssonicbld
requested review from
a team,
lguohan and
qiluo-msft
as code owners
jon-nokia
pushed a commit
to jon-nokia/sonic-buildimage-msft
that referenced
this pull request
May 3, 2024
…utomatically (#17330) #### Why I did it src/sonic-host-services ``` * 445ec8b - (HEAD -> master, origin/master, origin/HEAD) Revert "Add support to make determine/process reboot-cause services restartable (Azure#86)" (Azure#89) (31 hours ago) [anamehra] ``` #### How I did it #### How to verify it #### Description for the changelog
r12f
pushed a commit
that referenced
this pull request
Dec 19, 2024
…e latest HEAD automatically (#20441) #### Why I did it src/wpasupplicant/sonic-wpa-supplicant ``` * 6153c6d52 - (HEAD -> master, origin/master, origin/HEAD) Changes to support PAC and 802.1X interaction (#89) (28 hours ago) [Vijaya Kumar Abbaraju] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
May 28, 2025
…est HEAD automatically (#1173) #### Why I did it src/sonic-platform-common ``` * 71d1244 - (HEAD -> 202503, origin/202503) Merge pull request #89 from arlakshm/dev/arlakshm/merge_202412 (4 days ago) [Arvindsrinivasan Lakshmi Narasimhan] |\ | failure_prs.log skip_prs.log ec60fb2 - Merge remote-tracking branch 'origin/202412' into dev/arlakshm/merge_202412 (5 days ago) [Arvindsrinivasan Lakshmi Narasimhan] |/ * 2e8885d - Added LPO media interface code (#85) (12 days ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
Jun 8, 2025
…tomatically (#1213) #### Why I did it src/sonic-swss ``` * c203cec - (HEAD -> 202503, origin/202503) Merge pull request #89 from mssonicbld/sonicbld/202503-merge (21 hours ago) [mssonicbld] * c48655b - Merge branch '202412' of https://github.com/Azure/sonic-swss.msft into 202503 (23 hours ago) [Sonic Automation] * 735a52f - Merge pull request #87 from mssonicbld/sonicbld/202412-merge (2 days ago) [mssonicbld] * 2761106 - Merge branch '202411' of https://github.com/sonic-net/sonic-swss into 202412 (2 days ago) [Sonic Automation] * 9c3daae - [202411][muxorch] Catch error when checking active state of missing neighbor (2 days ago) [Kumaresh Perumal] |\ | failure_prs.log skip_prs.log 0a1e41e - [muxorch] Catch error when checking active state of missing neighbor (3 days ago) [Nikola Dancejic] * cc0255b - Update swss pipeline to use ubuntu 22.04 agent pool (#3677) (3 days ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
Pterosaur
pushed a commit
that referenced
this pull request
Sep 17, 2025
…tomatically (#1610) #### Why I did it src/sonic-gnmi ``` * 0222d5f - (HEAD -> 202412, origin/202412) Merge pull request #101 from Azure/202412-dev (2 hours ago) [Zain Budhwani] * ec20f64 - (origin/202412-dev) Support Show Interface tranceiver lpmode (#92) (17 hours ago) [yiliu4] * c9b5498 - "Make interface as arg instead of option for `show interface alias` and `show interface flap` (#100) (24 hours ago) [axin] * e9f0e29 - Add show interfaces portchannel /ecn (#77) (27 hours ago) [jiayuj2021] * 126f6fe - Add implementation for 'show ipv6 prefix-list' (#84) (34 hours ago) [nanali-msft] * 9977ae6 - Remove non-common functions from show_common.go (#98) (34 hours ago) [gnemuw] * d76043c - Add option SONIC_CLI_IFACE_MODE to support naming mode environment variable refresh in gnmi (#88) (2 days ago) [axin] * 37692e9 - Replacing the `queue-type` option with subcommands for `show queue watermark` (#89) (2 days ago) [mramezani95] * 3f4bd4b - Fix srv6 stats (#95) (2 days ago) [Changrong Wu] ``` #### How I did it #### How to verify it #### Description for the changelog
prabhataravind
pushed a commit
that referenced
this pull request
Oct 31, 2025
…D automatically (#1768) #### Why I did it src/sonic-sairedis ``` * da4a0b2c - (HEAD -> 202506, origin/202506) Revert "[meta] do not fail bulk operations if MODE_IGNORE_ERROR (#89)" (#96) (27 minutes ago) [prabhataravind] ``` #### How I did it #### How to verify it #### Description for the changelog
bingwang-ms
pushed a commit
that referenced
this pull request
Jan 16, 2026
…er-dependency (#23716) #### Why I did it sonic-swss-common ``` dc05565 2025-08-14 | Revert "[strict yang] Add YANG based cfg_schema.h to schema.h (#1008)" (#1067) [jingwenxie] e782b12 2025-08-12 | Add c-api/Rust wrappers for ConfigDBConnector and EventPublisher (#1062) [Qi Luo] 1484a85 2025-08-08 | Ignore nonexistent include in database_global.json (#1041) [yue-fred-gao] 839ddf0 2025-08-08 | [strict yang] Add YANG based cfg_schema.h to schema.h (#1008) [jingwenxie] ``` sonic-dash-ha ``` 6163990 2025-08-12 | Update sonic_db_config_initialize_global with extra argument (#98) [yue-fred-gao] 01a88ef 2025-08-07 | Suppress update from consumer bridge if there is no change (#89) [yue-fred-gao] ```
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.