[code sync] Merge code from sonic-net/sonic-buildimage:202405 to 202405#1124
Merged
mssonicbld merged 2 commits intoAzure:202405from May 15, 2025
Merged
[code sync] Merge code from sonic-net/sonic-buildimage:202405 to 202405#1124mssonicbld merged 2 commits intoAzure:202405from
mssonicbld merged 2 commits intoAzure:202405from
Conversation
Collaborator
mssonicbld
commented
May 15, 2025
mssonicbld
commented
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### 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-isolation` flag was introduced. However, our reproducible build has since been upgraded to use PyYAML 6.0.1, which leads to version conflicts. ``` target/sonic-cisco-8000.bin__cisco-8000__rfs.squashfs.log-+ sudo https_proxy= LANG=C chroot ./fsroot-cisco-8000 pip3 install PyYAML==5.4.1 --no-build-isolation target/sonic-cisco-8000.bin__cisco-8000__rfs.squashfs.log-ERROR: Cannot install PyYAML==5.4.1 because these package versions have conflicting dependencies. target/sonic-cisco-8000.bin__cisco-8000__rfs.squashfs.log- target/sonic-cisco-8000.bin__cisco-8000__rfs.squashfs.log-The conflict is caused by: target/sonic-cisco-8000.bin__cisco-8000__rfs.squashfs.log- The user requested PyYAML==5.4.1 target/sonic-cisco-8000.bin__cisco-8000__rfs.squashfs.log- The user requested (constraint) pyyaml==6.0.1 ``` ``` target/docker-config-engine-bullseye.gz.log-Step 14/28 : RUN pip3 install PyYAML==5.4.1 --no-build-isolation target/docker-config-engine-bullseye.gz.log- ---> Running in 87fe7ac9e1ef target/docker-config-engine-bullseye.gz.log-ERROR: Cannot install PyYAML==5.4.1 because these package versions have conflicting dependencies. target/docker-config-engine-bullseye.gz.log- target/docker-config-engine-bullseye.gz.log-The conflict is caused by: target/docker-config-engine-bullseye.gz.log- The user requested PyYAML==5.4.1 target/docker-config-engine-bullseye.gz.log- The user requested (constraint) pyyaml==6.0.1 ``` This PR resolves the conflict by removing the explicit installation of PyYAML 5.4.1 introduced in PR #15890. ##### Work item tracking - Microsoft ADO **(number only)**: #### 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. <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in 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 <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
liushilongbuaa
pushed a commit
that referenced
this pull request
Mar 25, 2026
…omatically (#24792) #### Why I did it src/sonic-swss-common ``` * 03c6777 - (HEAD -> master, origin/master, origin/HEAD) Opportunistically use a matching kernel version for building the modules (#1138) (2 days ago) [Saikrishna Arcot] * 41acbf8 - Ensure RedisPipeline dtor not to throw (#1115) (5 days ago) [Qi Luo] * e8a9592 - Reapply "Fix risky unwrap(), expect(), and casting (#1113)" (#1118) (#1124) (5 days ago) [Qi Luo] ``` #### How I did it #### How to verify it #### Description for the changelog
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
1 participant
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.