[armhf][sonic-installer] Fix an issue of the sonic-installer install after the cleanup#12609
Merged
yxieca merged 1 commit intosonic-net:masterfrom Dec 2, 2022
Merged
Conversation
…mage after sonic-installer clean Signed-off-by: mlok <[email protected]>
Contributor
Author
|
@carl-nokia @jon-nokia Please review the platform.conf change for the armhf platform installation issue |
Contributor
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Blueve
approved these changes
Nov 7, 2022
Blueve
pushed a commit
to sonic-net/sonic-utilities
that referenced
this pull request
Nov 9, 2022
…set-default and cleanup (#2479) What I did sonic-installer list will throw a exception when install images as the following step (onie-nos-install ) Install first image A (sonic-installer) Install Image B and not reboot it (sonic-installer) set default to back to Image A sudo sonic-installer cleanup At this time, executing sonic-installer list will throw exception How I did it Modify the get_next_image() in uboot.py to check and return index 1 when the images list contains two elements. This PR should work with sonic-net/sonic-buildimage#12609 This PR is needed by branch 202012 and 2022o5 Signed-off-by: mlok <[email protected]>
Contributor
|
Let's merge this PR after all sonic-utilites submodule advanced with new fix |
yxieca
pushed a commit
to sonic-net/sonic-utilities
that referenced
this pull request
Nov 10, 2022
…set-default and cleanup (#2479) What I did sonic-installer list will throw a exception when install images as the following step (onie-nos-install ) Install first image A (sonic-installer) Install Image B and not reboot it (sonic-installer) set default to back to Image A sudo sonic-installer cleanup At this time, executing sonic-installer list will throw exception How I did it Modify the get_next_image() in uboot.py to check and return index 1 when the images list contains two elements. This PR should work with sonic-net/sonic-buildimage#12609 This PR is needed by branch 202012 and 2022o5 Signed-off-by: mlok <[email protected]>
Contributor
|
@Blueve I've cherry-picked the utilities PR to 202205. Are you going to move utilities submodule head for master then merge this PR? |
Contributor
|
Hi @mlok-nokia , can you help advance sonic-utilities submodule for master and internal branches? Then we can merge this PR and cherry-pick to 202205 |
mlok-nokia
added a commit
to mlok-nokia/sonic-utilities
that referenced
this pull request
Nov 14, 2022
…set-default and cleanup (sonic-net#2479) What I did sonic-installer list will throw a exception when install images as the following step (onie-nos-install ) Install first image A (sonic-installer) Install Image B and not reboot it (sonic-installer) set default to back to Image A sudo sonic-installer cleanup At this time, executing sonic-installer list will throw exception How I did it Modify the get_next_image() in uboot.py to check and return index 1 when the images list contains two elements. This PR should work with sonic-net/sonic-buildimage#12609 This PR is needed by branch 202012 and 2022o5 Signed-off-by: mlok <[email protected]> (cherry picked from commit d1ca2cd)
Blueve
pushed a commit
to sonic-net/sonic-utilities
that referenced
this pull request
Nov 16, 2022
… of sonic-installer list after set-default and cleanup (#2479) (#2497) What I did sonic-installer list will throw a exception when install images as the following step (onie-nos-install ) Install first image A (sonic-installer) Install Image B and not reboot it (sonic-installer) set default to back to Image A sudo sonic-installer cleanup At this time, executing sonic-installer list will throw exception How I did it Modify the get_next_image() in uboot.py to check and return index 1 when the images list contains two elements. This PR should work with sonic-net/sonic-buildimage#12609 This PR is needed by branch 202012 and 2022o5 Signed-off-by: mlok <[email protected]> (cherry picked from commit d1ca2cd)
Contributor
Author
|
Contributor
Author
Hi Ying, This PR have NO dependency with other PR in submodule sonic-utilities. |
Contributor
Author
Hi Jing, This PR has NO dependency with other PR. They address different issues. Thanks. |
preetham-singh
pushed a commit
to preetham-singh/sonic-utilities
that referenced
this pull request
Nov 21, 2022
…set-default and cleanup (sonic-net#2479) What I did sonic-installer list will throw a exception when install images as the following step (onie-nos-install ) Install first image A (sonic-installer) Install Image B and not reboot it (sonic-installer) set default to back to Image A sudo sonic-installer cleanup At this time, executing sonic-installer list will throw exception How I did it Modify the get_next_image() in uboot.py to check and return index 1 when the images list contains two elements. This PR should work with sonic-net/sonic-buildimage#12609 This PR is needed by branch 202012 and 2022o5 Signed-off-by: mlok <[email protected]>
mdanish-kh
pushed a commit
to mdanish-kh/sonic-utilities
that referenced
this pull request
Nov 23, 2022
…set-default and cleanup (sonic-net#2479) What I did sonic-installer list will throw a exception when install images as the following step (onie-nos-install ) Install first image A (sonic-installer) Install Image B and not reboot it (sonic-installer) set default to back to Image A sudo sonic-installer cleanup At this time, executing sonic-installer list will throw exception How I did it Modify the get_next_image() in uboot.py to check and return index 1 when the images list contains two elements. This PR should work with sonic-net/sonic-buildimage#12609 This PR is needed by branch 202012 and 2022o5 Signed-off-by: mlok <[email protected]>
Contributor
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
mssonicbld
pushed a commit
to mssonicbld/sonic-buildimage
that referenced
this pull request
Dec 7, 2022
…mage after sonic-installer clean (sonic-net#12609) Signed-off-by: mlok <[email protected]> Signed-off-by: mlok <[email protected]>
Collaborator
|
Cherry-pick PR to 202205: #12977 |
mssonicbld
pushed a commit
that referenced
this pull request
Dec 7, 2022
…mage after sonic-installer clean (#12609) Signed-off-by: mlok <[email protected]> Signed-off-by: mlok <[email protected]>
qiluo-msft
pushed a commit
that referenced
this pull request
Jan 12, 2023
…mage after sonic-installer clean (#12609) Signed-off-by: mlok <[email protected]> Signed-off-by: mlok <[email protected]>
malletvapid23
added a commit
to malletvapid23/Sonic-Utility
that referenced
this pull request
Aug 3, 2023
…set-default and cleanup (#2479) What I did sonic-installer list will throw a exception when install images as the following step (onie-nos-install ) Install first image A (sonic-installer) Install Image B and not reboot it (sonic-installer) set default to back to Image A sudo sonic-installer cleanup At this time, executing sonic-installer list will throw exception How I did it Modify the get_next_image() in uboot.py to check and return index 1 when the images list contains two elements. This PR should work with sonic-net/sonic-buildimage#12609 This PR is needed by branch 202012 and 2022o5 Signed-off-by: mlok <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why I did it
When using sonic-installer to set-default and cleanup image or install a third image as the following steps, issues ocur.
At this time, executing sonic-installer list will throw exception
How I did it
When install a image without rebooting, uboot setting is not able to identify which (sonic_version_ sonic_version_2) should be use for the next image installed or cleanup after the set default. Modified the platform.conf to use the current running image from /proc/cmdline to identify eother sonic_version_ or sonic_version_2 should be used for the new installation.
This PR work with sonic-net/sonic-utilities#2479
How to verify it
Using the following test case to verify it
Case 1:
Case 2:
6) sonic-installer install an image C (SONIC-OS-202205.0-dirty-20221104.050348)
7) sonic-installer list. It should lis image as expected
Case 3:
8) reboot the system.
9) sonic-installer list
Case 4
10) sonic-installer install the image A.
11) it should be indicated that the image has been installed and just set to default.
case 5:
12 execute sonic-installer list
Case 6:
13) reboot the device
14) and sonic-installer list
Case 7:
15) sonic-installer set-default to image C (SONIC-OS-202205.0-dirty-20221104.050348)
16) sonic-installer list
Case 8:
17) reboot the device
18) sonic-installer list
Case 9:
19) install image B (SONiC-OS-202205.0-dirty-20221104.050857)
20) sonic-installer list
Case 10:
21) reboot the device
22) sonic-installer list
Which release branch to backport (provide reason below if selected)
Description for the changelog
Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)