Make bfb installer install first bfb-intermediate file found inside archive#25544
Open
croos12 wants to merge 5 commits intosonic-net:masterfrom
Open
Make bfb installer install first bfb-intermediate file found inside archive#25544croos12 wants to merge 5 commits intosonic-net:masterfrom
croos12 wants to merge 5 commits intosonic-net:masterfrom
Conversation
Signed-off-by: Connor Roos <croos@nvidia.com>
Signed-off-by: Connor Roos <croos@nvidia.com>
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
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
2 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
The existing sonic-bfb-installer.sh script does not install bfb-intermediate files if they do not match the name of the bfb package. This PR removes the check that the bfb-intermediate file has the same name as the bfb package and instead matches to the first bfb-intermediate file found so that the bfb-intermediate file is read even if it does not match the name of the package.
How I did it
Removed grep "$(basename "$bfb_file")"
How to verify it
Test by giving the tar archive a different name than the bfb-intermediate file inside it:
root@npu:/home/admin# mv sonic-nvidia-bluefield.bfb 202511_RC_sonic-nvidia-bluefield.bfb
root@npu:/home/admin# sonic-bfb-installer.sh -b 202511_RC_sonic-nvidia-bluefield.bfb -r all
Detected tar archive extracting BFB and SHA256 hash...
Extracted BFB file: /tmp/tmp.xZ6fYNmZPk/sonic-nvidia-bluefield.bfb-intermediate
Found SHA256 hash file: /tmp/tmp.xZ6fYNmZPk/sonic-nvidia-bluefield.bfb-intermediate.sha256
Verifying SHA256 checksum...
SHA256 checksum verification successful
Tested branch (Please provide the tested image version)
Description for the changelog
Make bfb installer install first bfb-intermediate file found inside archive.