Upgrade VS syncd to Bookworm#18347
Merged
yxieca merged 3 commits intosonic-net:masterfrom Apr 22, 2024
Merged
Conversation
Contributor
Author
|
/azpw run Azure.sonic-buildimage |
Collaborator
|
/AzurePipelines run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
saiarcot895
force-pushed
the
bookworm-syncd-vs
branch
from
e64322d to
0174126
Compare
As part of this, iproute2 is no longer compiled here, since the macsec patch is now in version 6.1. In addition, for docker-sonic-vs, version 6.1 of iproute2 is pulled from the bullseye-backports repo. Signed-off-by: Saikrishna Arcot <[email protected]>
Signed-off-by: Saikrishna Arcot <[email protected]>
saiarcot895
force-pushed
the
bookworm-syncd-vs
branch
from
0174126 to
001ff28
Compare
prsunny
previously approved these changes
Apr 10, 2024
This submodule update needs to go as part of this change because it would break compatibility with Bullseye for MACsec, but adds compatibility for Bookworm, which is what is needed here. This brings in the following commits: ``` 73ada8d5 Fix SSCI parameter when creating MACsec tunnels on Bookworm (sonic-net/sonic-sairedis#1372) c41a0cb9 SAI submodule update to bring saithrift changes for syncd bookworm (sonic-net/sonic-sairedis#1370) be47489f Add Bookworm build to PR checks (sonic-net/sonic-sairedis#1371) d9ba01b5 Update ip commands for MACsec for Bookworm (sonic-net/sonic-sairedis#1368) ``` Signed-off-by: Saikrishna Arcot <[email protected]>
saiarcot895
force-pushed
the
bookworm-syncd-vs
branch
from
001ff28 to
507a0a1
Compare
yxieca
approved these changes
Apr 22, 2024
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
As part of this, iproute2 is no longer compiled here, since the macsec patch is now in version 6.1. In addition, for docker-sonic-vs, version 6.1 of iproute2 is pulled from the bullseye-backports repo.
This PR also includes a sonic-sairedis submodule update. That submodule update needs to go with this PR because sonic-net/sonic-sairedis#1368 adds compatibility for the version of iproute2 that is in Bookworm, but breaks compatibility for the version of iproute2 (with our patches) that is in Bullseye. This means that the regular automated submodule update for that submodule will fail, since it will run tests on the master branch syncd container that is still on Bullseye.
The following commits are included as part of the submodule update:
Depends on sonic-net/sonic-sairedis#1368, sonic-net/sonic-sairedis#1372, and sonic-net/sonic-mgmt#1228.
Work item tracking
How I did it
How to verify it
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)