Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#67

Merged
mssonicbld merged 8 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge
Jul 20, 2023
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#67
mssonicbld merged 8 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge

Conversation

@mssonicbld
Copy link
Collaborator

* b4f86cd15 - (head/202205) [submodule update] sonic-sairedis (#15831) (2023-07-19) [abdosi]
* 8b2d1b288 - [submodule] Update submodule sonic-restapi to the latest HEAD automatically (#15886) (2023-07-19) [mssonicbld]
* f55d574ec - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#15887) (2023-07-19) [mssonicbld]
* 07388fd1f - advance dhcprelay to 6a6ce24, add default dhcpv6 dualtor source interface (#15881) (2023-07-19) [jcaiMR]
* 0291dae68 - [ci/build]: Upgrade SONiC package versions (#15855) (2023-07-19) [mssonicbld]
* d0648f81c - [Build] Fix the PyYang python package installation issue (#15890) (#15907) (2023-07-19) [xumia]
* 1243a6e2f - cherry-pick frr log enhancement for graceful restart (#15863) (2023-07-19) [StormLiangMS]<br>```

StormLiangMS and others added 8 commits July 19, 2023 07:32
Graceful restart is a key event for bgpd, related log print is debug level. To change it to info level to get more visibilities when this kind of event is triggered.
…5907)

Why I did it
Fix the armhf build failure.
How to reproduce the issue:

docker run -it debain:bullseye bash
apt-get update && apt-get install -y python3-pip
pip3 install PyYAML==5.4.1
Error message:

Collecting PyYAML==5.4.1
  Installing build dependencies ... done
  Getting requirements to build wheel ... error
  ERROR: Command errored out with exit status 1:
   command: /usr/bin/python3 /tmp/tmp6xabslgb_in_process.py get_requires_for_build_wheel /tmp/tmp_er01ztl
....
      raise AttributeError(attr)
  AttributeError: cython_sources
  ----------------------------------------
WARNING: Discarding https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d/PyYAML-5.4.1.tar.gz#sha256=607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e (from https://pypi.org/simple/pyyaml/) (requires-python:>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*). Command errored out with exit status 1: /usr/bin/python3 /tmp/tmp6xabslgb_in_process.py get_requires_for_build_wheel /tmp/tmp_er01ztl Check the logs for full command output.
ERROR: Could not find a version that satisfies the requirement PyYAML==5.4.1
ERROR: No matching distribution found for PyYAML==5.4.1
root@fa2fa92edcfd:/#
But if adding the option --no-build-isolation, then it is good, see fix.

install "PyYAML==5.4.1" --no-build-isolation
The same error can be found in the multiple builds.

Work item tracking
Microsoft ADO (number only): 24567457

How I did it
Add a build option --no-build-isolation.
…face (#15881)

sonic-build image side change to fix source interface selection in dual tor scenario.
dhcprelay related PR:
[master]fix dhcpv6 relay dual tor source interface selection issue sonic-dhcp-relay#42

Announce dhcprelay submodule to 6a6ce24 to include PR Azure#42
…lly (#15887)

src/sonic-swss

* ed0ca898 - (HEAD -> 202205, origin/202205) Add missing parameter to on_switch_shutdown_request method. (#2567) (34 hours ago) [Hua Liu]
…ically (#15886)

src/sonic-restapi

* a69ba06 - (HEAD -> 202205, origin/master, origin/HEAD, origin/202205, master) [actions] Support Semgrep by Github Actions (Azure#144) (3 weeks ago) [Mai Bui]
* 6b242a3 - [Ci] Upgrade python 2 to python 3 (Azure#145) (3 weeks ago) [xumia]
* 1c50caa - prevent downcasting of 64-bit integer (Azure#142) (2 months ago) [Mai Bui]
* de26989 - Use -race detector when building and testing (Azure#141) (3 months ago) [Lawrence Lee]
* 9fe2eff - [go] Update Go to version 1.15 (Azure#140) (3 months ago) [Lawrence Lee]
56aee6c0dfc4705584764edd35b7b2977bb762eb (HEAD -> 202205, origin/202205) [202205] Advance SAI submodule to fix issue sonic-net/sonic-buildimage#14706 (Azure#1265)

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
@mssonicbld mssonicbld merged commit 1b844f3 into Azure:202205 Jul 20, 2023
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request May 3, 2024
…utomatically (#15548)

#### Why I did it
src/sonic-host-services
```
* 508d642 - (HEAD -> master, origin/master, origin/HEAD) [actions] Support Semgrep by Github Actions (Azure#67) (31 hours ago) [Mai Bui]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Mar 15, 2025
… automatically (#883)

#### Why I did it
src/sonic-platform-common
```
* b732241 - (HEAD -> 202405, origin/202405) Restore optoe page to default 0 for active cables (#549) (#67) (21 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Apr 15, 2025
…tomatically (#992)

#### Why I did it
src/sonic-swss
```
* 7498ae9 - (HEAD -> 202412, origin/202412) Merge pull request #67 from mssonicbld/sonicbld/202412-merge (21 hours ago) [mssonicbld]
* bbce4b4 - Merge branch '202411' of https://github.com/sonic-net/sonic-swss into 202412 (21 hours ago) [Sonic Automation]
* fceb196 - Revert "Optimize counter polling interval by making it more accurate (11 days ago) [Kumaresh Perumal]
* d88b694 - Remove unused string variables in flexcounterorch.cpp (12 days ago) [Kumaresh Perumal]
|\ 
| failure_prs.log skip_prs.log 1e4315e - Remove unused string variables in flexcounterorch.cpp (12 days ago) [Kumaresh Perumal]
|/ 
* e82f8c2 - Revert "Optimize counter polling interval by making it more accurate (#3500)" (12 days ago) [Kumaresh Perumal]
```
#### How I did it
#### How to verify it
#### Description for the changelog
r12f pushed a commit that referenced this pull request Jun 30, 2025
…D automatically (#1283)

#### Why I did it
src/sonic-sairedis
```
* 0ae8494 - (HEAD -> 202412, origin/HEAD, origin/202412) [unittest ]Conditionally enable TestServerSaiMockChannel (#67) (37 minutes ago) [mssonicbld]
* 12b21f3 - [syncd] Check whether stat_st and tam_telemetry is defined (#1590) (#65) (5 days ago) [Ze Gan]
* 701a114 - [TAM]: Fix TAM notification and vslib implementation (#1606) (#62) (5 days ago) [Ze Gan]
* 6b97f74 - [SAI]: Update SAI to support QUERY_STATS_ST_CAPABILITY and TAM (#1573) (#63) (5 days ago) [Ze Gan]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Jul 8, 2025
…D automatically (#1323)

#### Why I did it
src/sonic-sairedis
```
* c4d152d4 - (HEAD -> 202503, origin/202503) Merge pull request #59 from mssonicbld/sonicbld/202503-merge (23 hours ago) [mssonicbld]
* 8f50be71 - Merge branch '202412' of https://github.com/Azure/sonic-sairedis.msft into 202503 (23 hours ago) [Sonic Automation]
* b36d5641 - (origin/HEAD, origin/202412, 202412) [trim]: Add Packet Trimming Asym DSCP to VS lib (#68) (4 days ago) [mssonicbld]
* 6e75cc6c - [TAM]: Add default SAI_TAM_ATTR_TELEMETRY_OBJECTS_LIST of TAM for saivs create operation (#1614) (#66) (8 days ago) [Ze Gan]
* 0ae8494d - [unittest ]Conditionally enable TestServerSaiMockChannel (#67) (8 days ago) [mssonicbld]
* 12b21f3b - [syncd] Check whether stat_st and tam_telemetry is defined (#1590) (#65) (13 days ago) [Ze Gan]
* 701a114b - [TAM]: Fix TAM notification and vslib implementation (#1606) (#62) (13 days ago) [Ze Gan]
* 6b97f74e - [SAI]: Update SAI to support QUERY_STATS_ST_CAPABILITY and TAM (#1573) (#63) (13 days ago) [Ze Gan]
* f21e12ce - [trim]: Add Packet Trimming Port/Queue stats to VS lib (#60) (4 weeks ago) [Nazarii Hnydyn]
* 9d396448 - Merge pull request #61 from mssonicbld/cherry/msft-202412/1548 (4 weeks ago) [Ze Gan]
|\ 
| failure_prs.log 613654bb - [syncd] Move log set function after api initialize (4 weeks ago) [Sonic Build Admin]
|/ 
* e18530c8 - Update SAI version to 1.16.1 (#54) (8 weeks ago) [mramezani95]
* 3c33c26e - Update codeql runs-on ubuntu version to 22.04 (#56) (8 weeks ago) [mssonicbld]
* 87d6f464 - [trim]: Add Packet Trimming to VS lib (#55) (9 weeks ago) [mssonicbld]
* 80c43090 - Support auto negotiation on the VS platform to avoid error messages. (#52) (10 weeks ago) [mssonicbld]
* 0209ab89 - [FlexCounter] add support for SRv6 MySID counters (#50) (2 months ago) [mssonicbld]
* aceb9ed1 - Move time stamp to time stamp table in counter database to avoid frequently update the counter table (#51) (2 months ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Pterosaur pushed a commit that referenced this pull request Sep 12, 2025
…tomatically (#1600)

#### Why I did it
src/sonic-gnmi
```
*   64e8539 - (HEAD -> 202412, origin/202412) Merge pull request #97 from Azure/202412-dev (4 hours ago) [Zain Budhwani]
|\  
| * 0de6456 - Adapt to the new usages of arguments (#93) (6 hours ago) [Changrong Wu]
| * 0be3a77 - Remove redundant helper function toString from show_common.go (#86) (23 hours ago) [gnemuw]
| * ff54cad - Fetch arguments from path and supply getters with parsed arguments (#82) (25 hours ago) [Zain Budhwani]
| * 14660a2 - Add `show dropcounters config` (#79) (33 hours ago) [Changrong Wu]
| * 1b7b835 - Added telemetry support for the 'show queue watermark' command. (#72) (5 days ago) [mramezani95]
| * 417ebe5 - interaces description implementation (#69) (6 days ago) [Vijay Sharma]
| * d3140d8 - Implement 'show ipv6 route' command (#64) (6 days ago) [gnemuw]
| * a715f58 - Add show services (#74) (7 days ago) [Zhaoyang Zhang]
| * fe4ab1c - Fix the show headroom_pool typo (#76) (7 days ago) [Guoqiang Yuan]
| * 0277718 - Add show interface naming_mode (#73) (7 days ago) [axin]
| * 03519fe - Add show interface neighbor expected (#54) (7 days ago) [jiayuj2021]
| * f29223a - Add 'show ipv6 fib' command (#67) (7 days ago) [Guoqiang Yuan]
| * 8ae677e - Add SHOW implementation for processes (#63) (8 days ago) [yiliu4]
| * 61927f9 - [202412] Add support of 'show ipv6 link-local-mode' command (#65) (8 days ago) [cgangx]
| * 4dca30c - Add show interface flap support (#66) (8 days ago) [axin]
| * 18c276b - Add show system memory (#57) (8 days ago) [Changrong Wu]
| * 00cc010 - Add support for show interface status (#32) (8 days ago) [Changrong Wu]
| * 941b3a2 - Minor changes from VLAN Brief PR Comments (#68) (8 days ago) [Vijay Sharma]
| * af89dec - show uptime (#39) (9 days ago) [Vijay Sharma]
| * 718ffd7 - Add show ipv6 bgp network (#61) (9 days ago) [Zhaoyang Zhang]
| * 8346e29 - [202412] Add support for 'show ipv6 bgp neighbors (#58) (9 days ago) [zitingguo-ms]
| * aec577c - Add implementation for show lldp neighbors (#56) (10 days ago) [nanali-msft]
| * b561228 - Add show dropcounters counts / capabilities (#40) (13 days ago) [jiayuj2021]
| * 16d6ccc - Add support for dev branches in CodeQL analysis (13 days ago) [Zain Budhwani]
* 8e41780 - Revert "Sync 202412 dev with 202412 (#94)" (#96) (4 hours ago) [Zain Budhwani]
* c5b5383 - Sync 202412 dev with 202412 (#94) (5 hours ago) [Zain Budhwani]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Oct 11, 2025
…HEAD automatically (#1716)

#### Why I did it
src/sonic-swss-common
```
* 1a31cda - (HEAD -> 202506, origin/202506) Add pop batch size support for ZMQ Consumer (#67) (2 hours ago) [mssonicbld]
```
#### 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
…ly (#23161)

#### Why I did it
src/sonic-ztp
```
* f8fa833 - (HEAD -> master, origin/master, origin/HEAD) [ci] Upgrade agent pool from ubuntu 20.04 to latest. (#67) (22 hours ago) [Liu Shilong]
```
#### 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
…ically (#23211)

#### Why I did it
src/sonic-dash-ha
```
* ff1b02a - (HEAD -> master, origin/master, origin/HEAD) Implement HA-Scope actor (#73) (20 hours ago) [yue-fred-gao]
* 832e67a - Implement HA-SET actor (#70) (4 days ago) [yue-fred-gao]
* cadfa46 - Implement vdpu actor (#67) (5 days ago) [yue-fred-gao]
```
#### 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
…ly (#24445)

#### Why I did it
src/dhcprelay
```
* 8772dd5 - (HEAD -> master, origin/master, origin/HEAD) [dhcp_relay] sonic dhcp relay agent for IPv4 (#67) (20 hours ago) [Shivashankar C R]
```
#### How I did it
#### How to verify it
#### Description for the changelog
liushilongbuaa pushed a commit that referenced this pull request Mar 25, 2026
… (#25508)

#### Why I did it
src/dhcpmon
```
* d78974f - (HEAD -> master, origin/master, origin/HEAD) [dhcp_mon] Add missing #include <algorithm> for std::replace (#68) (31 hours ago) [rustiqly]
* d4934fa - Add .github/copilot-instructions.md for AI-assisted development (#67) (31 hours ago) [rustiqly]
```
#### 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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants