Skip to content
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

Jump to bottom

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

Merged
merged 5 commits into from
Jul 14, 2024
Merged

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

merged 5 commits into from
Jul 14, 2024

Conversation

mssonicbld
Copy link
Collaborator 

* 95563679c - (head/202205) [ci/build]: Upgrade SONiC package versions (#17918) (2024-07-13) [mssonicbld]
* 2ceacd42b - [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#18744) (2024-07-13) [mssonicbld]
* ee5507c73 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#19224) (2024-07-13) [mssonicbld]
* 2b635593c - [202205, build] When check for docker arch, use DEFAULT_CONTAINER_REGISTRY if it is not null (#19466) (#19565) (2024-07-12) [Ying Xie]<br>```

yxieca and others added 5 commits July 12, 2024 22:05
@yxieca @liushilongbuaa
[202205, build] When check for docker arch, use DEFAULT_CONTAINER_REG…
2b63559 
…ISTRY if it is not null (#19466) (#19565)

Why I did it
DEFAULT_CONTAINER_REGISTRY didn't work as expected in some scenario.

How I did it
When check for docker arch, use DEFAULT_CONTAINER_REGISTRY if it is not null.

Co-authored-by: Liu Shilong <shilongliu@microsoft.com>
@mssonicbld
[submodule] Update submodule sonic-utilities to the latest HEAD autom…
ee5507c 
…atically (#19224)

src/sonic-utilities

* 8e71e656 - (HEAD -> 202205, origin/202205) [build] Fix base OS compilation issue caused by incompatibility between urllib3 and requests packages (#3328) (#3355) (5 weeks ago) [Volodymyr Samotiy]
@mssonicbld
[submodule] Update submodule sonic-platform-daemons to the latest HEA…
2ceacd4 
…D automatically (#18744)

src/sonic-platform-daemons

* dee5310 - (HEAD -> 202205, origin/202205) [ci] Fix 202205 pipeline issue. (#474) (3 months ago) [Liu Shilong]
@mssonicbld
[ci/build]: Upgrade SONiC package versions (#17918)
9556367
@mssonicbld
Merge branch '202205' of https://github.com/sonic-net/sonic-buildimage …
252faa2 
…into 202205
@mssonicbld mssonicbld merged commit 07c9c2d into sonic-net:202205 Jul 14, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@qiluo-msft qiluo-msft Awaiting requested review from qiluo-msft qiluo-msft is a code owner

@xumia xumia Awaiting requested review from xumia xumia is a code owner

@lguohan lguohan Awaiting requested review from lguohan lguohan is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mssonicbld @yxieca