Skip to content

Applied changes from PR#17263 to master to align with branching strategy #19877

Merged
yxieca merged 2 commits intosonic-net:masterfrom
nnelluri-cisco:cherry-pick-17263
Jul 30, 2025
Merged

Applied changes from PR#17263 to master to align with branching strategy #19877
yxieca merged 2 commits intosonic-net:masterfrom
nnelluri-cisco:cherry-pick-17263

Conversation

@nnelluri-cisco
Copy link
Copy Markdown
Contributor

@nnelluri-cisco nnelluri-cisco commented Jul 29, 2025 •
edited
Loading

Description of PR

This commit reintroduces the same functionality that was originally implemented in PR#17263 on the 202405 branch. It ensures that master also reflects the intended changes, as per our standard process.
Summary:Loganalyzer fix for cisco platform Cisco-8102-28FH-DPU-O-T1
Fixes # (issue)

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • New Test case
    • Skipped for non-supported platforms
  • Test case improvement

Back port request

  • 202205
  • 202305
  • 202311
  • 202405
  • 202411
  • [ X] 202505

Approach

added fix to loganalyzer_common_ignore.txt file.

What is the motivation for this PR?

tests were failing due to syslog error for the cisco smartswicth platform

How did you do it?

How did you verify/test it?

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Jul 29, 2025

/azp run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Jul 29, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@nnelluri-cisco
Copy link
Copy Markdown
Contributor Author

nnelluri-cisco commented Jul 29, 2025

@prabhataravind
as requested back-ported the changes into master branch .
#17263 (comment)

@yxieca yxieca requested a review from bingwang-ms July 29, 2025 20:33
@yxieca
Copy link
Copy Markdown
Collaborator

yxieca commented Jul 29, 2025

@nnelluri-cisco this is wrong direction of cherry-picking, we should have PR in master branch before feature branch. Now we need to fix any branch that might have missed this change.

@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Jul 29, 2025

/azp run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Jul 29, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@nnelluri-cisco
Copy link
Copy Markdown
Contributor Author

nnelluri-cisco commented Jul 29, 2025

@yxieca
Original PR is committed to 202405 branch , So for now we cherry picked int o master .
can you let us know how to proceed moving forward.

@prabhataravind
Copy link
Copy Markdown
Contributor

prabhataravind commented Jul 30, 2025

@yxieca Original PR is committed to 202405 branch , So for now we cherry picked int o master . can you let us know how to proceed moving forward.

@nnelluri-cisco Changes should always go to master first and then be cherry-picked to appropriate release branches. Otherwise it becomes a very painful process to track the changes.

@yxieca
Copy link
Copy Markdown
Collaborator

yxieca commented Jul 30, 2025

@yxieca Original PR is committed to 202405 branch , So for now we cherry picked int o master . can you let us know how to proceed moving forward.

@nnelluri-cisco Changes should always go to master first and then be cherry-picked to appropriate release branches. Otherwise it becomes a very painful process to track the changes.

Suggest change the wording of this PR, state the original purpose of the change. We are making a new commit with the same purpose. please don't use word 'cherry-pick'.

@nnelluri-cisco nnelluri-cisco changed the title cherry picked the chages for the PR17263 Applied changes from PR#17263 to master to align with branching strategy Jul 30, 2025
@nnelluri-cisco
Copy link
Copy Markdown
Contributor Author

nnelluri-cisco commented Jul 30, 2025

Thanks @yxieca for the advice.
changed the wording of the PR to align with branching strategy.

@yxieca yxieca merged commit 05f14c9 into sonic-net:master Jul 30, 2025
21 checks passed
mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Jul 30, 2025
@nnelluri-cisco @mssonicbld
Applied changes from PR#17263 to master to align with branching strat…
399aba9 
…egy (sonic-net#19877)

This commit reintroduces the same functionality that was originally implemented in PR#17263 on the 202405 branch. It ensures that master also reflects the intended changes, as per our standard process.
Summary:Loganalyzer fix for cisco platform Cisco-8102-28FH-DPU-O-T1
@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Jul 30, 2025

Cherry-pick PR to 202411: #19939

@mssonicbld mssonicbld mentioned this pull request Jul 30, 2025
Merged
10 tasks
mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Jul 31, 2025
@nnelluri-cisco @mssonicbld
Applied changes from PR#17263 to master to align with branching strat…
6cfc99f 
…egy (sonic-net#19877)

This commit reintroduces the same functionality that was originally implemented in PR#17263 on the 202405 branch. It ensures that master also reflects the intended changes, as per our standard process.
Summary:Loganalyzer fix for cisco platform Cisco-8102-28FH-DPU-O-T1
@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Jul 31, 2025

Cherry-pick PR to 202505: #19943

@mssonicbld mssonicbld mentioned this pull request Jul 31, 2025
Merged
10 tasks
@yejianquan yejianquan mentioned this pull request Jul 31, 2025
Merged
10 tasks
mssonicbld pushed a commit that referenced this pull request Jul 31, 2025
@nnelluri-cisco @mssonicbld
Applied changes from PR#17263 to master to align with branching strat…
6fad129 
…egy (#19877)

This commit reintroduces the same functionality that was originally implemented in PR#17263 on the 202405 branch. It ensures that master also reflects the intended changes, as per our standard process.
Summary:Loganalyzer fix for cisco platform Cisco-8102-28FH-DPU-O-T1
mssonicbld pushed a commit that referenced this pull request Aug 4, 2025
@nnelluri-cisco @mssonicbld
Applied changes from PR#17263 to master to align with branching strat…
f249478 
…egy (#19877)

This commit reintroduces the same functionality that was originally implemented in PR#17263 on the 202405 branch. It ensures that master also reflects the intended changes, as per our standard process.
Summary:Loganalyzer fix for cisco platform Cisco-8102-28FH-DPU-O-T1
nissampa pushed a commit to nissampa/sonic-mgmt_dpu_test that referenced this pull request Aug 7, 2025
@nnelluri-cisco @nissampa
Applied changes from PR#17263 to master to align with branching strat…
9d99963 
…egy (sonic-net#19877)

This commit reintroduces the same functionality that was originally implemented in PR#17263 on the 202405 branch. It ensures that master also reflects the intended changes, as per our standard process.
Summary:Loganalyzer fix for cisco platform Cisco-8102-28FH-DPU-O-T1
ashutosh-agrawal pushed a commit to ashutosh-agrawal/sonic-mgmt that referenced this pull request Aug 14, 2025
@nnelluri-cisco @ashutosh-agrawal
Applied changes from PR#17263 to master to align with branching strat…
a2a9b52 
…egy (sonic-net#19877)

This commit reintroduces the same functionality that was originally implemented in PR#17263 on the 202405 branch. It ensures that master also reflects the intended changes, as per our standard process.
Summary:Loganalyzer fix for cisco platform Cisco-8102-28FH-DPU-O-T1
vidyac86 pushed a commit to vidyac86/sonic-mgmt that referenced this pull request Oct 23, 2025
@nnelluri-cisco @vidyac86
Applied changes from PR#17263 to master to align with branching strat…
4113bb3 
…egy (sonic-net#19877)

This commit reintroduces the same functionality that was originally implemented in PR#17263 on the 202405 branch. It ensures that master also reflects the intended changes, as per our standard process.
Summary:Loganalyzer fix for cisco platform Cisco-8102-28FH-DPU-O-T1
opcoder0 pushed a commit to opcoder0/sonic-mgmt that referenced this pull request Dec 8, 2025
@nnelluri-cisco
Applied changes from PR#17263 to master to align with branching strat…
71d4873 
…egy (sonic-net#19877)

This commit reintroduces the same functionality that was originally implemented in PR#17263 on the 202405 branch. It ensures that master also reflects the intended changes, as per our standard process.
Summary:Loganalyzer fix for cisco platform Cisco-8102-28FH-DPU-O-T1

Signed-off-by: opcoder0 <110003254+opcoder0@users.noreply.github.com>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 16, 2025
@nnelluri-cisco @gshemesh2
Applied changes from PR#17263 to master to align with branching strat…
00e858b 
…egy (sonic-net#19877)

This commit reintroduces the same functionality that was originally implemented in PR#17263 on the 202405 branch. It ensures that master also reflects the intended changes, as per our standard process.
Summary:Loganalyzer fix for cisco platform Cisco-8102-28FH-DPU-O-T1

Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>
AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Dec 16, 2025
@nnelluri-cisco @AharonMalkin
Applied changes from PR#17263 to master to align with branching strat…
aceb7c3 
…egy (sonic-net#19877)

This commit reintroduces the same functionality that was originally implemented in PR#17263 on the 202405 branch. It ensures that master also reflects the intended changes, as per our standard process.
Summary:Loganalyzer fix for cisco platform Cisco-8102-28FH-DPU-O-T1

Signed-off-by: Aharon Malkin <amalkin@nvidia.com>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 21, 2025
@nnelluri-cisco @gshemesh2
Applied changes from PR#17263 to master to align with branching strat…
fd7d6d8 
…egy (sonic-net#19877)

This commit reintroduces the same functionality that was originally implemented in PR#17263 on the 202405 branch. It ensures that master also reflects the intended changes, as per our standard process.
Summary:Loganalyzer fix for cisco platform Cisco-8102-28FH-DPU-O-T1

Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>
venu-nexthop pushed a commit to venu-nexthop/sonic-mgmt that referenced this pull request Jan 13, 2026
@nnelluri-cisco @venu-nexthop
Applied changes from PR#17263 to master to align with branching strat…
ed96140 
…egy (sonic-net#19877)

This commit reintroduces the same functionality that was originally implemented in PR#17263 on the 202405 branch. It ensures that master also reflects the intended changes, as per our standard process.
Summary:Loganalyzer fix for cisco platform Cisco-8102-28FH-DPU-O-T1
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Jan 26, 2026
@nnelluri-cisco @gshemesh2
Applied changes from PR#17263 to master to align with branching strat…
447850c 
…egy (sonic-net#19877)

This commit reintroduces the same functionality that was originally implemented in PR#17263 on the 202405 branch. It ensures that master also reflects the intended changes, as per our standard process.
Summary:Loganalyzer fix for cisco platform Cisco-8102-28FH-DPU-O-T1

Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>
ytzur1 pushed a commit to ytzur1/sonic-mgmt that referenced this pull request Feb 2, 2026
@nnelluri-cisco @ytzur1
Applied changes from PR#17263 to master to align with branching strat…
e7ff87a 
…egy (sonic-net#19877)

This commit reintroduces the same functionality that was originally implemented in PR#17263 on the 202405 branch. It ensures that master also reflects the intended changes, as per our standard process.
Summary:Loganalyzer fix for cisco platform Cisco-8102-28FH-DPU-O-T1

Signed-off-by: Yael Tzur <ytzur@nvidia.com>
venu-nexthop pushed a commit to venu-nexthop/sonic-mgmt that referenced this pull request Mar 27, 2026
@nnelluri-cisco
Applied changes from PR#17263 to master to align with branching strat…
a1a708f 
…egy (sonic-net#19877)

This commit reintroduces the same functionality that was originally implemented in PR#17263 on the 202405 branch. It ensures that master also reflects the intended changes, as per our standard process.
Summary:Loganalyzer fix for cisco platform Cisco-8102-28FH-DPU-O-T1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yxieca yxieca yxieca approved these changes

@wangxin wangxin Awaiting requested review from wangxin

@bingwang-ms bingwang-ms Awaiting requested review from bingwang-ms

Assignees

No one assigned

Labels

Approved for 202411 branch Approved for 202505 branch Included in 202411 branch Included in 202505 branch Request for 202411 branch Request for 202505 branch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@nnelluri-cisco @mssonicbld @yxieca @prabhataravind @yejianquan @kperumalbfn