Skip to content

skip headroom pool test for Force10-S6100 T1 topo#12266

Merged
StormLiangMS merged 2 commits intosonic-net:masterfrom
XuChen-MSFT:xuchen3/master/skip-6100-t1-hdrm-test
Apr 12, 2024
Merged

skip headroom pool test for Force10-S6100 T1 topo#12266
StormLiangMS merged 2 commits intosonic-net:masterfrom
XuChen-MSFT:xuchen3/master/skip-6100-t1-hdrm-test

Conversation

@XuChen-MSFT
Copy link
Copy Markdown
Contributor

@XuChen-MSFT XuChen-MSFT commented Apr 2, 2024

Description of PR

Summary:
Fixes # (issue)

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • Test case(new/improvement)

Back port request

  • 201911
  • 202012
  • 202205
  • 202305
  • 202311

Approach

What is the motivation for this PR?

6100 T1's headroom pool test fail
For 6100, T0 and T1 have same buffer configuration, and T1's failure is related to lag keepalive.
xfail test for 6100's T1 topology.
and 6100's headroom pool test is covered by T0.

How did you do it?

set xfail for 6100 T1's headroom pool testcase

How did you verify/test it?

Any platform specific information?

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

Documentation

StormLiangMS
StormLiangMS previously approved these changes Apr 2, 2024
View reviewed changes
Copy link
Copy Markdown
Collaborator

@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
Copy link
Copy Markdown
Collaborator

StormLiangMS commented Apr 2, 2024

@XuChen-MSFT do we plan to fix it in future? Or we will skip this case for T1-lag topo? If we plan to fix, pls add an issue. If not, let's skip it other than xfail.

ZhaohuiS
ZhaohuiS reviewed Apr 2, 2024
View reviewed changes
Comment thread tests/common/plugins/conditional_mark/tests_mark_conditions.yaml Outdated
neethajohn
neethajohn reviewed Apr 2, 2024
View reviewed changes
Comment thread tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
@XuChen-MSFT XuChen-MSFT changed the title xfail headroom pool test for Force10-S6100 T1 topo skip headroom pool test for Force10-S6100 T1 topo Apr 3, 2024
@XuChen-MSFT
Copy link
Copy Markdown
Contributor Author

XuChen-MSFT commented Apr 8, 2024

/azp run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Apr 8, 2024

Commenter does not have sufficient privileges for PR 12266 in repo sonic-net/sonic-mgmt

ZhaohuiS
ZhaohuiS approved these changes Apr 12, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@ZhaohuiS ZhaohuiS 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 approved these changes Apr 12, 2024
View reviewed changes
Copy link
Copy Markdown
Collaborator

@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 36c8365 into sonic-net:master Apr 12, 2024
@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Apr 12, 2024

@XuChen-MSFT PR conflicts with 202305 branch

@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Apr 12, 2024

@XuChen-MSFT PR conflicts with 202311 branch

This was referenced Apr 15, 2024
Merged
Merged
StormLiangMS pushed a commit that referenced this pull request Apr 22, 2024
@XuChen-MSFT
double commit PR 12266 to fix conflict (#12456)
d42a5f3 
What is the motivation for this PR?
manually double commit PR #12266 for 202311 branch to resolve merge conflicts

How did you do it?
fix conflicts
StormLiangMS pushed a commit that referenced this pull request Apr 22, 2024
@XuChen-MSFT
double commit PR 12266 to fix conflict (#12457)
89851e7 
What is the motivation for this PR?
manually double commit PR #12266 for 202305 branch, to resolve conflict

How did you do it?
fix conflict
XuChen-MSFT added a commit to XuChen-MSFT/sonic-mgmt that referenced this pull request Mar 12, 2026
@XuChen-MSFT
[qos] Fix broken S6100 T1 headroom pool skip condition
a435a3b 
PR sonic-net#14912 incorrectly merged separate OR conditions into a single AND
condition, creating a logical contradiction:
  hwsku in ['Force10-S6100'] AND hwsku not in [..., 'Force10-S6100', ...]
This made the skip always FALSE, causing S6100 T1 headroom pool tests
to run and fail consistently since Oct 2024.

Restore the original separate OR conditions from PR sonic-net#12266.

Fixes sonic-net#12292

Co-authored-by: Copilot <[email protected]>
Signed-off-by: Xu Chen <[email protected]>
@XuChen-MSFT XuChen-MSFT mentioned this pull request Mar 12, 2026
Merged
11 tasks
XuChen-MSFT added a commit to XuChen-MSFT/sonic-mgmt that referenced this pull request Mar 12, 2026
@XuChen-MSFT
[qos] Fix broken S6100 T1 headroom pool skip condition
03b81ad 
PR sonic-net#14912 incorrectly merged separate OR conditions into a single AND
condition, creating a logical contradiction:
  hwsku in ['Force10-S6100'] AND hwsku not in [..., 'Force10-S6100', ...]
This made the skip always FALSE, causing S6100 T1 headroom pool tests
to run and fail consistently since Oct 2024.

Restore the original separate OR conditions from PR sonic-net#12266.

Fixes sonic-net#12292

Co-authored-by: Copilot <[email protected]>
Signed-off-by: Xu Chen <[email protected]>
XuChen-MSFT added a commit that referenced this pull request Mar 13, 2026
@XuChen-MSFT
[qos] Fix broken S6100 T1 headroom pool skip condition (#22909)
2590b91 
PR #14912 incorrectly merged separate OR conditions into a single AND
condition, creating a logical contradiction:
  hwsku in ['Force10-S6100'] AND hwsku not in [..., 'Force10-S6100', ...]
This made the skip always FALSE, causing S6100 T1 headroom pool tests
to run and fail consistently since Oct 2024.

Restore the original separate OR conditions from PR #12266.

Fixes #12292

Signed-off-by: Xu Chen <[email protected]>
Co-authored-by: Copilot <[email protected]>
selldinesh pushed a commit to selldinesh/sonic-mgmt that referenced this pull request Mar 16, 2026
@XuChen-MSFT @selldinesh
[qos] Fix broken S6100 T1 headroom pool skip condition (sonic-net#22909)
e834bd2 
PR sonic-net#14912 incorrectly merged separate OR conditions into a single AND
condition, creating a logical contradiction:
  hwsku in ['Force10-S6100'] AND hwsku not in [..., 'Force10-S6100', ...]
This made the skip always FALSE, causing S6100 T1 headroom pool tests
to run and fail consistently since Oct 2024.

Restore the original separate OR conditions from PR sonic-net#12266.

Fixes sonic-net#12292

Signed-off-by: Xu Chen <[email protected]>
Co-authored-by: Copilot <[email protected]>
Signed-off-by: selldinesh <[email protected]>
abhishek-nexthop pushed a commit to nexthop-ai/sonic-mgmt that referenced this pull request Mar 17, 2026
@XuChen-MSFT @abhishek-nexthop
[qos] Fix broken S6100 T1 headroom pool skip condition (sonic-net#22909)
d5fa6ec 
PR sonic-net#14912 incorrectly merged separate OR conditions into a single AND
condition, creating a logical contradiction:
  hwsku in ['Force10-S6100'] AND hwsku not in [..., 'Force10-S6100', ...]
This made the skip always FALSE, causing S6100 T1 headroom pool tests
to run and fail consistently since Oct 2024.

Restore the original separate OR conditions from PR sonic-net#12266.

Fixes sonic-net#12292

Signed-off-by: Xu Chen <[email protected]>
Co-authored-by: Copilot <[email protected]>
Signed-off-by: Abhishek <[email protected]>
vrajeshe pushed a commit to vrajeshe/sonic-mgmt that referenced this pull request Mar 23, 2026
@XuChen-MSFT @vrajeshe
[qos] Fix broken S6100 T1 headroom pool skip condition (sonic-net#22909)
fc47a2e 
PR sonic-net#14912 incorrectly merged separate OR conditions into a single AND
condition, creating a logical contradiction:
  hwsku in ['Force10-S6100'] AND hwsku not in [..., 'Force10-S6100', ...]
This made the skip always FALSE, causing S6100 T1 headroom pool tests
to run and fail consistently since Oct 2024.

Restore the original separate OR conditions from PR sonic-net#12266.

Fixes sonic-net#12292

Signed-off-by: Xu Chen <[email protected]>
Co-authored-by: Copilot <[email protected]>
Signed-off-by: Venkata Gouri Rajesh Etla <[email protected]>
ravaliyel pushed a commit to ravaliyel/sonic-mgmt that referenced this pull request Mar 27, 2026
@XuChen-MSFT @ravaliyel
[qos] Fix broken S6100 T1 headroom pool skip condition (sonic-net#22909)
9bd1e99 
PR sonic-net#14912 incorrectly merged separate OR conditions into a single AND
condition, creating a logical contradiction:
  hwsku in ['Force10-S6100'] AND hwsku not in [..., 'Force10-S6100', ...]
This made the skip always FALSE, causing S6100 T1 headroom pool tests
to run and fail consistently since Oct 2024.

Restore the original separate OR conditions from PR sonic-net#12266.

Fixes sonic-net#12292

Signed-off-by: Xu Chen <[email protected]>
Co-authored-by: Copilot <[email protected]>
selldinesh pushed a commit to selldinesh/sonic-mgmt that referenced this pull request Apr 1, 2026
@XuChen-MSFT @selldinesh
[qos] Fix broken S6100 T1 headroom pool skip condition (sonic-net#22909)
fb4eab0 
PR sonic-net#14912 incorrectly merged separate OR conditions into a single AND
condition, creating a logical contradiction:
  hwsku in ['Force10-S6100'] AND hwsku not in [..., 'Force10-S6100', ...]
This made the skip always FALSE, causing S6100 T1 headroom pool tests
to run and fail consistently since Oct 2024.

Restore the original separate OR conditions from PR sonic-net#12266.

Fixes sonic-net#12292

Signed-off-by: Xu Chen <[email protected]>
Co-authored-by: Copilot <[email protected]>
Signed-off-by: selldinesh <[email protected]>
albertovillarreal-keys pushed a commit to albertovillarreal-keys/sonic-mgmt that referenced this pull request Apr 3, 2026
@XuChen-MSFT @albertovillarreal-keys
[qos] Fix broken S6100 T1 headroom pool skip condition (sonic-net#22909)
5e6b58b 
PR sonic-net#14912 incorrectly merged separate OR conditions into a single AND
condition, creating a logical contradiction:
  hwsku in ['Force10-S6100'] AND hwsku not in [..., 'Force10-S6100', ...]
This made the skip always FALSE, causing S6100 T1 headroom pool tests
to run and fail consistently since Oct 2024.

Restore the original separate OR conditions from PR sonic-net#12266.

Fixes sonic-net#12292

Signed-off-by: Xu Chen <[email protected]>
Co-authored-by: Copilot <[email protected]>
opcoder0 pushed a commit to opcoder0/sonic-mgmt that referenced this pull request Apr 13, 2026
@XuChen-MSFT @opcoder0
[qos] Fix broken S6100 T1 headroom pool skip condition (sonic-net#22909)
ad8eee9 
PR sonic-net#14912 incorrectly merged separate OR conditions into a single AND
condition, creating a logical contradiction:
  hwsku in ['Force10-S6100'] AND hwsku not in [..., 'Force10-S6100', ...]
This made the skip always FALSE, causing S6100 T1 headroom pool tests
to run and fail consistently since Oct 2024.

Restore the original separate OR conditions from PR sonic-net#12266.

Fixes sonic-net#12292

Signed-off-by: Xu Chen <[email protected]>
Co-authored-by: Copilot <[email protected]>
Signed-off-by: opcoder0 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@neethajohn neethajohn neethajohn left review comments

@StormLiangMS StormLiangMS StormLiangMS approved these changes

@ZhaohuiS ZhaohuiS ZhaohuiS approved these changes

Assignees

No one assigned

Labels

Approved for 202305 branch Approved for 202311 branch Cherry Pick Conflict_202305 Cherry Pick Conflict_202311 Request for 202305 branch Request for 202311 branch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@XuChen-MSFT @StormLiangMS @mssonicbld @neethajohn @ZhaohuiS