[202511][supervisor] Updating supervisor pointer to 4.3.0 release#25861
Open
mattkim25 wants to merge 1 commit intosonic-net:202511from
Open
[202511][supervisor] Updating supervisor pointer to 4.3.0 release#25861mattkim25 wants to merge 1 commit intosonic-net:202511from
mattkim25 wants to merge 1 commit intosonic-net:202511from
Conversation
For the 202511 branch, the supervisor submodule points to the commit for 4.2.5, but the build process is expecting 4.3.0 Signed-off-by: Matthew Kim <mkim@upscaleai.com>
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
Fixes Issue: #25857
For the 202511 branch, the supervisor submodule points to the commit for 4.2.5, but the build process is expecting 4.3.0. This fails the build
The build rule expected Supervisor
4.3.0, but the source package and pinned Python versions are4.2.5, so the generated wheel name did not match the target artifact path.Work item tracking
How I did it
I updated the following in 202511 to match master
202511 Branch
Line 36 in files/build/versions/build/build-sonic-slave-bookworm/versions-py3.
Supervisor ref pointer is
99a3e3e240d9d13e143b306818731e224e1e73d2Line 3 in rules/supervisor.mk has
supervisor-4.2.5-py2.py3-none-any.whlMaster Branch
Line 36 in files/build/versions-public/build/build-sonic-slave-bookworm/versions-py3
Correct supervisor ref pointer is
dbca8d457e61d8707c40f99c78330b87939483a3and this exists in the master branch.Line 3 in rules/supervisor.mk has
supervisor-4.3.0-py2.py3-none-any.whlHow to verify it
Rebuild 202511 image
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)