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-utilities:202205 to 202205 #29

Merged
merged 3 commits into from
Sep 27, 2023
Merged

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

merged 3 commits into from
Sep 27, 2023

Commits on Sep 26, 2023

  1. [sonic-package-manager] Increate timeout for sonic-package-manager mi… 

    …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]>
    @yaqiangz @yxieca
    yaqiangz authored and yxieca committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    4bf29fe View commit details
    Browse the repository at this point in the history

  2. Handle NotImplementedError exception while changing optoe write max (… 

    …#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]>
    @mihirpat1 @yxieca
    mihirpat1 authored and yxieca committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    d9bc820 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. Merge branch '202205' of https://github.com/sonic-net/sonic-utilities … 

    …into 202205
    @mssonicbld
    mssonicbld committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    7df1c6b View commit details
    Browse the repository at this point in the history