[Broadcom] Bump XGS SAI to 15.2.0 / SDK 6.5.35#27465
Merged
Merged
Conversation
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run Azure.sonic-buildimage |
Contributor
Author
|
Pushed 33b1dbf — wraps This unblocks the previous Broadcom build failure: docker-syncd-brcm already builds from Refs ADO #38021904. |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run Azure.sonic-buildimage |
Contributor
Author
|
Revised the fix per @-discussion: instead of gating SAI out of the bookworm pass (which broke
The bookworm syncd binary is only baked into Commit: 42db23d |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run Azure.sonic-buildimage |
Contributor
Author
|
Pushed
Cause of previous failure (build 1119113): the new Watching the next Broadcom CI build. |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
|
hi @Gfrom2016 I just merged below one, you may want to address the conflict first. |
Gfrom2016
force-pushed
the
bump-sai-15.2.0-xgs
branch
from
May 27, 2026 02:41
4e9d86f to
e6a8f98
Compare
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Comment on lines
13
to
14
| LIBSAIBCM_XGS_VERSION = 14.3.0.0.0.0.16.0 | ||
| LIBSAIBCM_XGS_BRANCH_NAME = SAI_14.3.0_GA |
| # Broadcom SAI modules | ||
|
|
||
| BRCM_OPENNSL_KERNEL_VERSION = 14.3.0.0.0.0.0.0 | ||
| BRCM_OPENNSL_KERNEL_VERSION = 15.2.0.0.0.0.0.0 |
|
@saiarcot895 can you chime in here? Do we still need to do the if bookworm thing? |
Contributor
|
The conditional Bookworm check is no longer required, since the Broadcom containers have been migrated to Trixie. |
Update XGS SAI version to 15.2.0.0.0.0.0.0 (branch SAI_15.2.0_GA) and bump the saibcm-modules submodule pointer to the sdk-6.5.35-xgs branch HEAD. Signed-off-by: zitingguo <zitingguo@microsoft.com>
SAI 15.2 libsaibcm is built against Debian trixie (requires libc6>=2.38, libstdc++6>=14, libprotobuf32t64) and cannot be installed in the bookworm sonic-slave. Wrap the package registration in ifeq($(BLDENV),trixie) so SONIC_ONLINE_DEBS only picks it up in the trixie pass, matching the rules/sonic-redfish.mk pattern. docker-syncd-brcm already uses docker-config-engine-trixie and consumes libsaibcm from target/debs/trixie/. Signed-off-by: zitingguo <zitingguo@microsoft.com>
SAI 15.2 debs are built against trixie (libc6 >= 2.38, libstdc++6 >= 14, libprotobuf32t64) and cannot install in the bookworm slave. The final SONiC image is trixie-based (IMAGE_DISTRO=trixie), so production artifacts use 15.2. The bookworm pass keeps building SAI 14.3 for transitional artifacts (e.g. the syncd binary baked into gearbox containers gbsyncd-broncos/milleniob/agera2) until broadcom is fully migrated to trixie. Signed-off-by: zitingguo <zitingguo@microsoft.com>
… 15.2 - saibcm-modules: point to sdk-6.5.35-xgs HEAD (b9b3879) which includes the bcm-genl DCBDIR path fallback restoration (sonic-net/saibcm-modules#38). - sai-modules.mk: bump BRCM_OPENNSL_KERNEL_VERSION 14.3.0.0.0.0.0.0 -> 15.2.0.0.0.0.0.0 to match the SAI 15.2 / SDK 6.5.35 upgrade. Signed-off-by: zitingguo <zitingguo@microsoft.com>
Signed-off-by: zitingguo <zitingguo@microsoft.com>
…ally Broadcom containers have been fully migrated to trixie (see PRs sonic-net#27563 and sonic-net#26898), so the bookworm/trixie BLDENV conditional in sai-xgs.mk is no longer needed. Use SAI 15.2.0_GA unconditionally. Signed-off-by: zitingguo <zitingguo@microsoft.com>
Gfrom2016
force-pushed
the
bump-sai-15.2.0-xgs
branch
from
June 2, 2026 07:07
5c5b920 to
1c5c91c
Compare
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
saiarcot895
approved these changes
Jun 2, 2026
purush-nexthop
pushed a commit
to nexthop-ai/sonic-buildimage
that referenced
this pull request
Jun 10, 2026
* [Broadcom] Bump XGS SAI to 15.2.0 / SDK 6.5.35 Update XGS SAI version to 15.2.0.0.0.0.0.0 (branch SAI_15.2.0_GA) and bump the saibcm-modules submodule pointer to the sdk-6.5.35-xgs branch HEAD. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: register libsaibcm only in trixie BLDENV SAI 15.2 libsaibcm is built against Debian trixie (requires libc6>=2.38, libstdc++6>=14, libprotobuf32t64) and cannot be installed in the bookworm sonic-slave. Wrap the package registration in ifeq($(BLDENV),trixie) so SONIC_ONLINE_DEBS only picks it up in the trixie pass, matching the rules/sonic-redfish.mk pattern. docker-syncd-brcm already uses docker-config-engine-trixie and consumes libsaibcm from target/debs/trixie/. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: keep 14.3 in bookworm pass, 15.2 in trixie pass SAI 15.2 debs are built against trixie (libc6 >= 2.38, libstdc++6 >= 14, libprotobuf32t64) and cannot install in the bookworm slave. The final SONiC image is trixie-based (IMAGE_DISTRO=trixie), so production artifacts use 15.2. The bookworm pass keeps building SAI 14.3 for transitional artifacts (e.g. the syncd binary baked into gearbox containers gbsyncd-broncos/milleniob/agera2) until broadcom is fully migrated to trixie. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [broadcom] Bump saibcm-modules submodule + opennsl-modules version to 15.2 - saibcm-modules: point to sdk-6.5.35-xgs HEAD (b9b3879) which includes the bcm-genl DCBDIR path fallback restoration (sonic-net/saibcm-modules#38). - sai-modules.mk: bump BRCM_OPENNSL_KERNEL_VERSION 14.3.0.0.0.0.0.0 -> 15.2.0.0.0.0.0.0 to match the SAI 15.2 / SDK 6.5.35 upgrade. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: bump bookworm 14.3 version to .16.0 to match master Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: remove bookworm conditional, use 15.2 unconditionally Broadcom containers have been fully migrated to trixie (see PRs sonic-net#27563 and sonic-net#26898), so the bookworm/trixie BLDENV conditional in sai-xgs.mk is no longer needed. Use SAI 15.2.0_GA unconditionally. Signed-off-by: zitingguo <zitingguo@microsoft.com> --------- Signed-off-by: zitingguo <zitingguo@microsoft.com>
This was referenced Jun 16, 2026
roger530-ho
pushed a commit
to roger530-ho/sonic-buildimage
that referenced
this pull request
Jun 23, 2026
* [Broadcom] Bump XGS SAI to 15.2.0 / SDK 6.5.35 Update XGS SAI version to 15.2.0.0.0.0.0.0 (branch SAI_15.2.0_GA) and bump the saibcm-modules submodule pointer to the sdk-6.5.35-xgs branch HEAD. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: register libsaibcm only in trixie BLDENV SAI 15.2 libsaibcm is built against Debian trixie (requires libc6>=2.38, libstdc++6>=14, libprotobuf32t64) and cannot be installed in the bookworm sonic-slave. Wrap the package registration in ifeq($(BLDENV),trixie) so SONIC_ONLINE_DEBS only picks it up in the trixie pass, matching the rules/sonic-redfish.mk pattern. docker-syncd-brcm already uses docker-config-engine-trixie and consumes libsaibcm from target/debs/trixie/. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: keep 14.3 in bookworm pass, 15.2 in trixie pass SAI 15.2 debs are built against trixie (libc6 >= 2.38, libstdc++6 >= 14, libprotobuf32t64) and cannot install in the bookworm slave. The final SONiC image is trixie-based (IMAGE_DISTRO=trixie), so production artifacts use 15.2. The bookworm pass keeps building SAI 14.3 for transitional artifacts (e.g. the syncd binary baked into gearbox containers gbsyncd-broncos/milleniob/agera2) until broadcom is fully migrated to trixie. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [broadcom] Bump saibcm-modules submodule + opennsl-modules version to 15.2 - saibcm-modules: point to sdk-6.5.35-xgs HEAD (b9b3879) which includes the bcm-genl DCBDIR path fallback restoration (sonic-net/saibcm-modules#38). - sai-modules.mk: bump BRCM_OPENNSL_KERNEL_VERSION 14.3.0.0.0.0.0.0 -> 15.2.0.0.0.0.0.0 to match the SAI 15.2 / SDK 6.5.35 upgrade. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: bump bookworm 14.3 version to .16.0 to match master Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: remove bookworm conditional, use 15.2 unconditionally Broadcom containers have been fully migrated to trixie (see PRs sonic-net#27563 and sonic-net#26898), so the bookworm/trixie BLDENV conditional in sai-xgs.mk is no longer needed. Use SAI 15.2.0_GA unconditionally. Signed-off-by: zitingguo <zitingguo@microsoft.com> --------- Signed-off-by: zitingguo <zitingguo@microsoft.com>
xdqi
pushed a commit
to canonical/sonic-buildimage
that referenced
this pull request
Jul 6, 2026
* [Broadcom] Bump XGS SAI to 15.2.0 / SDK 6.5.35 Update XGS SAI version to 15.2.0.0.0.0.0.0 (branch SAI_15.2.0_GA) and bump the saibcm-modules submodule pointer to the sdk-6.5.35-xgs branch HEAD. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: register libsaibcm only in trixie BLDENV SAI 15.2 libsaibcm is built against Debian trixie (requires libc6>=2.38, libstdc++6>=14, libprotobuf32t64) and cannot be installed in the bookworm sonic-slave. Wrap the package registration in ifeq($(BLDENV),trixie) so SONIC_ONLINE_DEBS only picks it up in the trixie pass, matching the rules/sonic-redfish.mk pattern. docker-syncd-brcm already uses docker-config-engine-trixie and consumes libsaibcm from target/debs/trixie/. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: keep 14.3 in bookworm pass, 15.2 in trixie pass SAI 15.2 debs are built against trixie (libc6 >= 2.38, libstdc++6 >= 14, libprotobuf32t64) and cannot install in the bookworm slave. The final SONiC image is trixie-based (IMAGE_DISTRO=trixie), so production artifacts use 15.2. The bookworm pass keeps building SAI 14.3 for transitional artifacts (e.g. the syncd binary baked into gearbox containers gbsyncd-broncos/milleniob/agera2) until broadcom is fully migrated to trixie. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [broadcom] Bump saibcm-modules submodule + opennsl-modules version to 15.2 - saibcm-modules: point to sdk-6.5.35-xgs HEAD (b9b3879) which includes the bcm-genl DCBDIR path fallback restoration (sonic-net/saibcm-modules#38). - sai-modules.mk: bump BRCM_OPENNSL_KERNEL_VERSION 14.3.0.0.0.0.0.0 -> 15.2.0.0.0.0.0.0 to match the SAI 15.2 / SDK 6.5.35 upgrade. Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: bump bookworm 14.3 version to .16.0 to match master Signed-off-by: zitingguo <zitingguo@microsoft.com> * [Broadcom] sai-xgs: remove bookworm conditional, use 15.2 unconditionally Broadcom containers have been fully migrated to trixie (see PRs sonic-net#27563 and sonic-net#26898), so the bookworm/trixie BLDENV conditional in sai-xgs.mk is no longer needed. Use SAI 15.2.0_GA unconditionally. Signed-off-by: zitingguo <zitingguo@microsoft.com> --------- Signed-off-by: zitingguo <zitingguo@microsoft.com>
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
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
Bump Broadcom XGS SAI to 15.2.0 (branch
SAI_15.2.0_GA) and update thesaibcm-modulessubmodule pointer to thesdk-6.5.35-xgsbranch HEAD. This is the SAI/SDK upgrade that pairs with the new XGS knet driver code onsdk-6.5.35-xgs.Work item tracking
How I did it
platform/broadcom/sai-xgs.mk:LIBSAIBCM_XGS_VERSION14.3.0.0.0.0.14.0 -> 15.2.0.0.0.0.0.0,LIBSAIBCM_XGS_BRANCH_NAMESAI_14.3.0_GA -> SAI_15.2.0_GA..gitmodules:platform/broadcom/saibcm-modulestracked branch sdk-6.5.34-xgs -> sdk-6.5.35-xgs.platform/broadcom/saibcm-modulessubmodule pointer -> 783070d (HEAD ofsdk-6.5.35-xgs).How to verify it
Run test with CI-built image: https://elastictest.org/scheduler/testplan/6a13c3f55ec6b5a1f3a2107a
Loaded the CI-built image on a Broadcom XGS testbed (
bjw2-can-7260-12, Arista-7260CX3-C64). All containers and BGP came up healthy after reboot.Which release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
Description for the changelog
[Broadcom] Bump XGS SAI to 15.2.0 / SDK 6.5.35