Skip to content
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

[Broadcom] Change xgs SAI branch to SAI_10.1.0_GA #19858

Merged
merged 1 commit into from
Aug 14, 2024

Conversation

Gfrom2016
Copy link
Contributor

Why I did it

Upgrade xgs SAI version to 10.1.37.0 with official branch.

  • 10.1.37.0: [CS00012362288][TH5] SAI Queue counters are not reported for all the queues
Work item tracking
  • Microsoft ADO (number only):

How I did it

Change back xgs SAI branch to SAI_10.1.0_GA.

How to verify it

Run SAI release validation pipeline: https://dev.azure.com/mssonic/internal/_build/results?buildId=613625&view=results

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305
  • 202311

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)

@@ -1,6 +1,6 @@
LIBSAIBCM_XGS_VERSION = 10.1.37.0
LIBSAIBCM_DNX_VERSION = 10.1.25.0
LIBSAIBCM_XGS_BRANCH_NAME = SAI_10.1.0_GA_CS00012362288
LIBSAIBCM_XGS_BRANCH_NAME = SAI_10.1.0_GA
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update 202405 branch as well.

I will close this 202405 PR - #19839

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We see cherrypick conflict for 202311 and 202405 branches for sai.mk, could you check so that we can avoid manual sync?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dnx SAI version is not same in master, 202311, and 202405 branch, the conflict is expected. I'll create PR to 202311 and 202405 branch manually for now.

lguohan pushed a commit that referenced this pull request Aug 9, 2024
This is a manual cherry-pick of #19858
Upgrade xgs SAI version to 10.1.37.0.

10.1.37.0: [CS00012362288][TH5] SAI Queue counters are not reported for all the queues
10.1.36.0: [CS00012355796, CS00012355797]TH5 - Custom MMU Specific SAI Changes to support LAB and Production

Signed-off-by: zitingguo-ms <[email protected]>
@Gfrom2016
Copy link
Contributor Author

This change has been cherry-picked to 202311 #19867 and 202405 #19868 , remove the request label

@StormLiangMS StormLiangMS merged commit 3b27e1c into sonic-net:master Aug 14, 2024
11 of 12 checks passed
matiAlfaro pushed a commit to Marvell-switching/sonic-buildimage that referenced this pull request Aug 21, 2024
Why I did it
Upgrade xgs SAI version to 10.1.37.0 with official branch.

10.1.37.0: [CS00012362288][TH5] SAI Queue counters are not reported for all the queues
Work item tracking
Microsoft ADO (number only):
How I did it
Change back xgs SAI branch to SAI_10.1.0_GA.

How to verify it
Run SAI release validation pipeline: https://dev.azure.com/mssonic/internal/_build/results?buildId=613625&view=results
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants