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.

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

[code sync] Merge code from sonic-net/sonic-utilities:202205 to 202205 #29

Merged
merged 3 commits into from
Sep 27, 2023

Conversation

mssonicbld
Copy link

* d9bc820e - (head/202205) Handle NotImplementedError exception while changing optoe write max (#2985) (2023-09-26) [mihirpat1]
* 4bf29fe2 - [sonic-package-manager] Increate timeout for sonic-package-manager migrate (#2973) (2023-09-26) [Yaqiang Zhu]<br>```

yaqiangz and others added 3 commits September 26, 2023 17:08
…grate (#2973)

What I did
When we migrate package via sonic-package-manager in some low-performance device, getting docker image from old image via docker socket may timeout by default timeout setting (60s) client.py. This PR is to increase timeout to 120s.

How I did it
Increase docker client timeout from 60s to 120s.

How to verify it
ut passed.
Build image with INCLUDE_MACSEC, and install it, macsec image was not include. And the build image with this PR, install it. Migrate package successfully.

Signed-off-by: Yaqiang Zhu <[email protected]>
…#2985)

* Handle NotImplementedError exception while changing optoe write max

Signed-off-by: Mihir Patel <[email protected]>

* Added unit test for more coverage

* Removed unused import

---------

Signed-off-by: Mihir Patel <[email protected]>
@mssonicbld mssonicbld merged commit 75030e0 into Azure:202205 Sep 27, 2023
3 checks passed
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.

3 participants