Fix package version conflict introduced by PR #15890#22424
Merged
wangxin merged 3 commits intosonic-net:masterfrom Apr 30, 2025
Merged
Fix package version conflict introduced by PR #15890#22424wangxin merged 3 commits intosonic-net:masterfrom
wangxin merged 3 commits intosonic-net:masterfrom
Conversation
yutongzhang-microsoft
requested review from
lguohan and
qiluo-msft
as code owners
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
|
||
| # The option --no-build-isolation can be removed when upgrading PyYAML to 6.0.1 | ||
| sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'PyYAML==5.4.1' --no-build-isolation | ||
| sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'PyYAML==6.0.1' |
Contributor
There was a problem hiding this comment.
Maybe we can remove this line. This line is added to resolve arm build failure.
Try remove these lines in build_debian.sh and config-engine-bullseye/Dockerfile.j2 and test.
It is added in #15890
Contributor
Author
There was a problem hiding this comment.
Let me try
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
|
Why the other workaround code added in original PR #15890 is not removed? |
Contributor
|
Is this change required for release branches too? |
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
yutongzhang-microsoft
added
Request for 202211 Branch
Request for 202012 Branch
Request for 202106 Branch
Request for 202111 Branch
Contributor
|
/azpw ms_conflict |
yutongzhang-microsoft
changed the title
wangxin
approved these changes
Apr 30, 2025
liushilongbuaa
added
Approved for 202411 Branch
and removed
Request for 202106 Branch
Request for 202111 Branch
11 tasks
Collaborator
|
Cherry-pick PR to 202411: #22597 |
liushilongbuaa
added
Approved for 202405 Branch
and removed
Created PR to 202411 Branch
labels
11 tasks
Collaborator
|
Cherry-pick PR to 202405: #22598 |
mssonicbld
added
Included in 202405 Branch
and removed
Created PR to 202405 Branch
labels
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
4 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
In PR #15890, to address an armhf build failure, the PyYAML version was pinned to 5.4.1 and the
--no-build-isolationflag was introduced. However, our reproducible build has since been upgraded to use PyYAML 6.0.1, which leads to version conflicts.This PR resolves the conflict by removing the explicit installation of PyYAML 5.4.1 introduced in PR #15890.
Work item tracking
How I did it
This PR resolves the conflict by removing the explicit installation of PyYAML 5.4.1 introduced in PR #15890.
How to verify it
Tested by pipeline itself, we can sucessfully build the images. And we will install PyYAML 6.0.1, which will not cause the version conflict.
Which release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
Description for the changelog
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)