Skip to content

Remove S2 port bcm configs for Arista-7060X6-64PE-B-O128#23100

Merged
StormLiangMS merged 1 commit intosonic-net:masterfrom
dayouliu1:fix-o128-configs
Jul 4, 2025
Merged

Remove S2 port bcm configs for Arista-7060X6-64PE-B-O128#23100
StormLiangMS merged 1 commit intosonic-net:masterfrom
dayouliu1:fix-o128-configs

Conversation

@dayouliu1
Copy link
Contributor

@dayouliu1 dayouliu1 commented Jun 26, 2025

Why I did it

Update Arista-7060X6-64PE-B-O128 bcm configs, remove unneeded S2 port configs

Work item tracking
  • Microsoft ADO (number only):

How I did it

How to verify it

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

  • 202205
  • 202211
  • 202305
  • 202311
  • 202405
  • 202411
  • 202505
  • 202412
  • 202503

Tested branch (Please provide the tested image version)

  • 202412

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@r12f
Copy link
Contributor

r12f commented Jun 26, 2025

hi @dayouliu1 do you mind to help update the PR title to be explicit on what is changed for?

e.g. Update Arista-7060X6-64PE-B-O128 bcm configs to remove the 2 service ports.

@dayouliu1 dayouliu1 changed the title Update Arista-7060X6-64PE-B-O128 bcm configs Update Arista-7060X6-64PE-B-O128 bcm configs to remove the 2 service ports Jun 27, 2025
@dayouliu1 dayouliu1 changed the title Update Arista-7060X6-64PE-B-O128 bcm configs to remove the 2 service ports Remove S2 port bcm configs for Arista-7060X6-64PE-B-O128 Jun 30, 2025
@StormLiangMS
Copy link
Contributor

@dayouliu1 could you check the conflict?

@StormLiangMS StormLiangMS requested a review from r12f July 2, 2025 08:29
@dayouliu1
Copy link
Contributor Author

Conflict resolved

@StormLiangMS StormLiangMS reopened this Jul 3, 2025
@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@r12f
Copy link
Contributor

r12f commented Jul 3, 2025

hi @dayouliu1 , have you tested this change and see if no more SAI crash would happen?

@dayouliu1
Copy link
Contributor Author

hi @dayouliu1 , have you tested this change and see if no more SAI crash would happen?

Yes

Copy link
Contributor

@StormLiangMS StormLiangMS left a comment

Choose a reason for hiding this comment

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

LGTM

@StormLiangMS StormLiangMS merged commit c3990e5 into sonic-net:master Jul 4, 2025
23 checks passed
@StormLiangMS
Copy link
Contributor

hi @dayouliu1 would you mind to file separate PR for 202412 and 202505? There are conflicts.

r12f added a commit to Azure/sonic-buildimage-msft that referenced this pull request Jul 9, 2025
…B-O128 (#1320)

Sync PR #23100 from sonic-net/sonic-buildimage to 202412.
Original PR: sonic-net/sonic-buildimage#23100

Co-authored-by: Dayou Liu <113053330+dayouliu1@users.noreply.github.com>
@dayouliu1
Copy link
Contributor Author

Update Arista-7060X6-64PE-B-O128 bcm configs, remove unneeded S2 port configs

I see Riff already has a 202412 pick.

202505 pick: #23268

@r12f
Copy link
Contributor

r12f commented Jul 10, 2025

Update Arista-7060X6-64PE-B-O128 bcm configs, remove unneeded S2 port configs

I see Riff already has a 202412 pick.

202505 pick: #23268

yep! trying to get the build out soon, so I went ahead :D , hopefully nothing crazy! ;P

@dakotac-arista
Copy link
Contributor

Hi @r12f, Does this PR need to be added to msft-202503 or will it happen automatically?

@dayouliu1
Copy link
Contributor Author

Could we also get this backported to msft-202503, thanks!

r12f pushed a commit to Azure/sonic-buildimage-msft that referenced this pull request Jul 23, 2025
)

<!--
Please make sure you've read and understood our contributing guidelines:
     https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

** Make sure all your commits include a signature generated with `git
commit -s` **

If this is a bug fix, make sure your description includes "fixes #xxxx",
or
     "closes #xxxx" or "resolves #xxxx"

     Please provide the following information:
-->

#### Why I did it
sonic-net/sonic-buildimage#23100
Change was only partially applied in the 202412 code sync

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it

#### How to verify it

<!--
If PR needs to be backported, then the PR must be tested against the
base branch and the earliest backport release branch and provide tested
image version on these two branches. For example, if the PR is requested
for master, 202211 and 202012, then the requester needs to provide test
results on master and 202012.
-->

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

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [ ] 201811
- [ ] 201911
- [ ] 202006
- [ ] 202012
- [ ] 202106
- [ ] 202111
- [ ] 202205
- [ ] 202211

#### Tested branch (Please provide the tested image version)

<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->

- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->

<!--
Ensure to add label/tag for the feature raised. example - PR#2174 under
sonic-utilities repo. where, Generic Config and Update feature has been
labelled as GCU.
-->

#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on
https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->

#### A picture of a cute animal (not mandatory but encouraged)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants