Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#291

Merged
mssonicbld merged 4 commits intoAzure:202305from
mssonicbld:sonicbld/202305-merge
Mar 12, 2024
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#291
mssonicbld merged 4 commits intoAzure:202305from
mssonicbld:sonicbld/202305-merge

Conversation

@mssonicbld
Copy link
Copy Markdown
Collaborator

* d5f9f8dd2 - (head/202305) [submodule] Update submodule sonic-swss to the latest HEAD automatically (#18315) (2024-03-12) [mssonicbld]
* 23dbba168 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#18316) (2024-03-12) [mssonicbld]
* 519850369 - [Build] Fix the pygobject installation issue (#18318) (2024-03-11) [xumia]<br>```

xumia and others added 4 commits March 11, 2024 22:07
Why I did it
Fix the build broken issue:

Processing /sonic_host_services-1.0-py3-none-any.whl
Requirement already satisfied: dbus-python in /usr/lib/python3/dist-packages (from sonic-host-services==1.0) (1.2.16)
Requirement already satisfied: systemd-python in /usr/local/lib/python3.9/dist-packages (from sonic-host-services==1.0) (235)
Requirement already satisfied: Jinja2>=2.10 in /usr/local/lib/python3.9/dist-packages (from sonic-host-services==1.0) (3.1.2)
Collecting PyGObject (from sonic-host-services==1.0)
  Downloading pygobject-3.48.0.tar.gz (714 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 714.2/714.2 kB 13.1 MB/s eta 0:00:00
  Installing build dependencies: started
  Installing build dependencies: finished with status 'done'
  Getting requirements to build wheel: started
  Getting requirements to build wheel: finished with status 'done'
  Installing backend dependencies: started
  Installing backend dependencies: finished with status 'error'
  error: subprocess-exited-with-error
  
Work item tracking
Microsoft ADO (number only): 27124786
How I did it
Install the pygobject before installing the sonic_host_services.
If installing during the .,whl, it will try to install the latest version (3.48.0), then it will have an issue. Prefer to use the version 3.46.0, see

sonic-buildimage/files/build/versions/host-image/versions-py3

Line 55 in a6437d8

 pygobject==3.46.0 

It will not add a new package, only install the depended packages firstly.
…atically (#18316)

#### Why I did it
src/sonic-utilities
```
* e2ac2b63 - (HEAD -> 202305, origin/202305) [Bug] Fix fw_setenv illegel character issue (#3201) (2 days ago) [xumia]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…lly (#18315)

#### Why I did it
src/sonic-swss
```
* 1d651e8b - (HEAD -> 202305, origin/202305) Fix the Orchagent crash seen during Port channel OC test cases. (#3042) (2 days ago) [saksarav-nokia]
```
#### How I did it
#### How to verify it
#### Description for the changelog
@mssonicbld mssonicbld requested a review from lguohan as a code owner March 12, 2024 03:02
@mssonicbld mssonicbld merged commit 06047cb into Azure:202305 Mar 12, 2024
r12f pushed a commit that referenced this pull request Dec 19, 2024
…lly (#20449)

#### Why I did it
src/sonic-gnmi
```
* 1b6d8c0 - (HEAD -> master, origin/master, origin/HEAD) Fix issue with getting DPU IP address from DHCP_SERVER_IPV4_PORT table (#291) (4 hours ago) [Oleksandr Ivantsiv]
```
#### How I did it
#### How to verify it
#### Description for the changelog
r12f pushed a commit that referenced this pull request Jun 19, 2025
…y (#22921)

#### Why I did it
src/linkmgrd
```
* d5cb087 - (HEAD -> 202411, origin/202411) [active-active] Fix mux not toggle to active in default route flapping (#291) (#298) (3 days ago) [Longxiang Lyu]
* 549d51d - Fix pipeline to use bookwarm (#300) (4 days ago) [mssonicbld]
* 555cec6 - [ci][build] deprecate ubuntu 20.04 agent pool (#299) (4 days ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit to mssonicbld/sonic-buildimage-msft that referenced this pull request Jul 18, 2025
…utomatically (#23363)

#### Why I did it
src/sonic-host-services
```
* 5f79c8f - (HEAD -> 202505, origin/202505) Improve LC reboot cause for supervisor heartbeat loss (Azure#291) (16 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Jul 29, 2025
…t HEAD automatically (#1399)

#### Why I did it
src/sonic-host-services
```
* 598cf31 - (HEAD -> 202506, origin/202506) Merge pull request #5 from mssonicbld/sonicbld/202506-merge (12 hours ago) [mssonicbld]
* 5f79c8f - Improve LC reboot cause for supervisor heartbeat loss (#291) (8 days ago) [mssonicbld]
* d86b612 - Fix ProcessStatsST column name issue and add test case to cover check (#286) (2 weeks 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
…y (#22754)

#### Why I did it
src/linkmgrd
```
* 68f1767 - (HEAD -> master, origin/master, origin/HEAD) [active-active] Fix mux not toggle to active in default route flapping (#291) (21 hours ago) [Longxiang Lyu]
```
#### How I did it
#### How to verify it
#### Description for the changelog
r12f pushed a commit that referenced this pull request Mar 12, 2026
…AD automatically (#2052)

#### Why I did it
src/sonic-utilities
```
* bce9106f - (HEAD -> 202412, origin/202412) config: allow golden config to override mac, platform, asic_id (#291) (3 hours ago) [securely1g]
```
#### How I did it
#### How to verify it
#### Description for the changelog

Signed-off-by: Sonic Automation <[email protected]>
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.

2 participants