-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upgrade SONiC to Debian Bullseye #8191
Upgrade SONiC to Debian Bullseye #8191
Conversation
e26de0b
to
ec23e15
Compare
can you resolve the conflict so that the build can proceed? |
Conflicts have been resolved. The expectation is that the kvm image should build (none of the containers will get built), broadcom will fail to build (vendor platform modules need changes), mellanox likely will fail to build. |
4fb8fd2
to
84f3ae1
Compare
/azp run |
Pull request contains merge conflicts. |
can you resolve merge conflict, i think the last commit on swss-common is no longer needed. |
14a2976
to
03acae4
Compare
The Currently, though, the CI run is reporting a test failure in the
|
swss-common submodule has already been updated in master branch, you do not need to update it again. |
looks like we still have the sonic-cfggen unit test failure. |
Build failures are caused by the The commits responsible for this change are sonic-net/sonic-telemetry@4bb02f5 (overwriting
|
7c6be1c
to
ce43981
Compare
Waiting for #8282 to be merged to fix build issue. |
1db7542
to
bcb752e
Compare
@@ -19,7 +19,7 @@ endif | |||
$(DOCKER_SYNCD_BFN_RPC)_CONTAINER_NAME = syncd | |||
$(DOCKER_SYNCD_BFN_RPC)_VERSION = 1.0.0-rpc | |||
$(DOCKER_SYNCD_BFN_RPC)_PACKAGE_NAME = syncd | |||
$(DOCKER_SYNCD_BFN_RPC)_RUN_OPT += --net=host --privileged -t |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you share more insight why "--net=host is specified twice" ? Maybe we should fix the other place.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Commit c948379 made some changes in files/build_templates/docker_image_ctl.j2. Specifically, it added some code here to explicitly specify which network namespace/topology the container should run in (with the --net=
flag): either the host namespace (so that it has all of the host network interfaces accessible within the container), connected to the Docker bridge with veth interfaces (this is the default), or the namespace of another container.
If the container isn't a per-ASIC container (meaning there's only one for the system), then it'll put it in the host namespace. Otherwise, if it's in a multi-ASIC environment and the database container is being started, then that container will be connected in its own network namespace via the default Docker bridge and a veth interface. Otherwise, it'll use the namespace of the database container for that ASIC.
This change also removed all of the explicit --net=host
flags specified in the run options for other containers (see the files changed in rules/
directory in that commit), but didn't handle the ones that were defined in the platform/
directory. So I'm replicating the change made in that commit for these other containers.
i can see the src/sonic-swss-common as a conflict and it blocks the build, can you consider merge your changes in src/sonic-swss-common into the repo so that we won't have such conflict in the future. |
fde34be
to
0487f6f
Compare
035577e
to
8c0e059
Compare
Hi @saiarcot895 if possible could you please avoid force pushing to this branch? I know its generally not a problem on feature branches but I am currently working on aligning Mellanox code to this branch in parallel and it would be extremely helpful for me to have a consistent history so that I can better merge in changes from your end as they come in. Please let me know if there are any problems or anything I can do to help. |
can you fix the lgtm? |
Signed-off-by: Saikrishna Arcot <[email protected]>
ISSU will likely be broken. As of right now, the issu-version file is not being generated during build. Signed-off-by: Saikrishna Arcot <[email protected]>
…te file instead of the individual container definitions Signed-off-by: Saikrishna Arcot <[email protected]>
Add an include in saibcm-modules and saibcm-modules-dnx that are now needed due to Mellanox kernel patches. Signed-off-by: Saikrishna Arcot <[email protected]>
Ported Iptables patch for supporting fullcone NAT option to 5.10 kernel. Signed-off-by: Kiran Kella <[email protected]>
1. Fix build for armhf and arm64 2. upgrade centec tsingma bsp support to 5.10 kernel 3. modify centec platform driver for linux 5.10 Co-authored-by: Shi Lei <[email protected]>
Upgrade DellEMC platforms to bullseye.
Also add out of tree pca9548 mux driver to use platform data to mapping i2c bus with front panel port. Signed-off-by: Jakkapan Jangmuang <[email protected]> Co-authored-by: Saikrishna Arcot <[email protected]>
Signed-off-by: Saikrishna Arcot <[email protected]>
Allow mellanox platform to build and successfully switch packets in Debian 11 Upgraded * Mellanox SDK * Mellanox Hardware Management * Mellanox Firmware * Mellanox Kernel Patches Adjusted build system to support host system running bullseye and dockers running buster.
Fixes sonic-net#9011. Signed-off-by: Saikrishna Arcot <[email protected]>
* Upgrade new DellEMC platforms to Bullseye * Update s5212f kernel module
* Make neccesary changed to mellanox platform code to build on Debian 11 * Revert use of backported kernel to build mft and elect to only build kernel module under bullseye
Update Barefoot platform support for Bullseye and 5.10 kernel, and add python3-venv.
Signed-off-by: Saikrishna Arcot <[email protected]>
ipmihelper files are repeated for few DellEMC platforms. Removed the files in sonic_platform since as part of debian rules,ipmihelper will be copied to necessary directory.
Updated the hw-mgmt pointer to include some bugfixes related to power supply voltages.
Signed-off-by: Saikrishna Arcot <[email protected]>
841fc3f
to
42855e3
Compare
This pull request fixes 5 alerts when merging 42855e3 into a8ae39d - view on LGTM.com fixed alerts:
|
Why I did it
In preparation for Debian Bullseye, upgrade SONiC's base system to be based on Bullseye, which was released in August 2021. Major changes from Buster are:
pip2.7
) have been removed from Bullseye. The Python 2 interpreter is still available.How I did it
The kernel has been upgraded to 5.10.46, and the base system is now based on Bullseye. Containers are still based on Buster.
How to verify it
Which release branch to backport (provide reason below if selected)
Description for the changelog
A picture of a cute animal (not mandatory but encouraged)