Skip to content

Skipping PFCWD tests for lossy topos & add anchor section#20326

Merged
StormLiangMS merged 1 commit intosonic-net:masterfrom
davidm-arista:master-lossyToposPfcwdSkipping
Sep 12, 2025
Merged

Skipping PFCWD tests for lossy topos & add anchor section#20326
StormLiangMS merged 1 commit intosonic-net:masterfrom
davidm-arista:master-lossyToposPfcwdSkipping

Conversation

@davidm-arista
Copy link
Copy Markdown
Collaborator

Description of PR

Summary:
This is adding a new section to the tests_mark_conditions.yaml file so that common conditions can be defined once, and then re-used in the rest of this file.

This section currently only defines lossyTopos, and this change uses that throughout the tests_mark_conditions.yaml file.

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
  • 202505

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@davidm-arista davidm-arista requested a review from wangxin as a code owner August 19, 2025 20:41
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@davidm-arista davidm-arista force-pushed the master-lossyToposPfcwdSkipping branch from 9ef9278 to 1ee66cc Compare August 19, 2025 21:21
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@davidm-arista davidm-arista force-pushed the master-lossyToposPfcwdSkipping branch from 1ee66cc to 903f443 Compare August 22, 2025 16:23
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@davidm-arista
Copy link
Copy Markdown
Collaborator Author

I created #20382 to merge before this, to allow this PR to pass its checks

wangxin pushed a commit that referenced this pull request Sep 9, 2025
Ensure pre-test is first item in conditional mark check, because pre-test runs before everything else, and it makes the most sense at the top of the file.

Also this change goes with #20326
This change will allow that PR to pass its PR checks.
This is adding a new section to the tests_mark_conditions.yaml file so that common
conditions can be defined once, and then re-used in the rest of this file.

This section currently only defines lossyTopos, and this change uses that throughout
the tests_mark_conditions.yaml file.
@davidm-arista davidm-arista force-pushed the master-lossyToposPfcwdSkipping branch from 903f443 to 817ecf1 Compare September 9, 2025 00:40
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@sdszhang sdszhang closed this Sep 9, 2025
@sdszhang sdszhang reopened this Sep 9, 2025
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Sep 9, 2025
…t#20382)

Ensure pre-test is first item in conditional mark check, because pre-test runs before everything else, and it makes the most sense at the top of the file.

Also this change goes with sonic-net#20326
This change will allow that PR to pass its PR checks.
mssonicbld added a commit to mssonicbld/sonic-mgmt.msft that referenced this pull request Sep 9, 2025
Summary:
Ensure pre-test is first item in conditional mark check, because pre-test runs before everything else, and it makes the most sense at the top of the file.

Also this change goes with sonic-net/sonic-mgmt#20326
This change will allow that PR to pass its PR checks.

### Type of change
- [X] Testbed and Framework(new/improvement)

### Back port request
- [ ] 202205
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [X] 202505

### Approach
#### What is the motivation for this PR?
To allow sonic-net/sonic-mgmt#20326 to pass the PR checks

#### How did you verify/test it?
Running it manually on PR 20326

#### Any platform specific information?
No

#### Supported testbed topology if it's a new test case?
N/A
mssonicbld added a commit to Azure/sonic-mgmt.msft that referenced this pull request Sep 9, 2025
…mark check (#689)

Summary:
Ensure pre-test is first item in conditional mark check, because pre-test runs before everything else, and it makes the most sense at the top of the file.

Also this change goes with sonic-net/sonic-mgmt#20326
This change will allow that PR to pass its PR checks.

### Type of change
- [X] Testbed and Framework(new/improvement)

### Back port request
- [ ] 202205
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [X] 202505

### Approach
#### What is the motivation for this PR?
To allow sonic-net/sonic-mgmt#20326 to pass the PR checks

#### How did you verify/test it?
Running it manually on PR 20326

#### Any platform specific information?
No

#### Supported testbed topology if it's a new test case?
N/A
mssonicbld pushed a commit that referenced this pull request Sep 9, 2025
Ensure pre-test is first item in conditional mark check, because pre-test runs before everything else, and it makes the most sense at the top of the file.

Also this change goes with #20326
This change will allow that PR to pass its PR checks.
@sdszhang sdszhang closed this Sep 11, 2025
@sdszhang sdszhang reopened this Sep 11, 2025
AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Dec 16, 2025
…20326)

This is adding a new section to the tests_mark_conditions.yaml file so that common
conditions can be defined once, and then re-used in the rest of this file.

This section currently only defines lossyTopos, and this change uses that throughout
the tests_mark_conditions.yaml file.

Signed-off-by: Aharon Malkin <[email protected]>
AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Dec 16, 2025
…net#20642)

sonic-net#20326 was missing a "conditions_logical_operator: or", which this PR adds.

Since that PR has not merged to any branches yet, this only needed for master

Signed-off-by: Aharon Malkin <[email protected]>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 21, 2025
…t#20382)

Ensure pre-test is first item in conditional mark check, because pre-test runs before everything else, and it makes the most sense at the top of the file.

Also this change goes with sonic-net#20326
This change will allow that PR to pass its PR checks.

Signed-off-by: Guy Shemesh <[email protected]>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 21, 2025
…20326)

This is adding a new section to the tests_mark_conditions.yaml file so that common
conditions can be defined once, and then re-used in the rest of this file.

This section currently only defines lossyTopos, and this change uses that throughout
the tests_mark_conditions.yaml file.

Signed-off-by: Guy Shemesh <[email protected]>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 21, 2025
…net#20642)

sonic-net#20326 was missing a "conditions_logical_operator: or", which this PR adds.

Since that PR has not merged to any branches yet, this only needed for master

Signed-off-by: Guy Shemesh <[email protected]>
venu-nexthop pushed a commit to venu-nexthop/sonic-mgmt that referenced this pull request Jan 13, 2026
…t#20382)

Ensure pre-test is first item in conditional mark check, because pre-test runs before everything else, and it makes the most sense at the top of the file.

Also this change goes with sonic-net#20326
This change will allow that PR to pass its PR checks.
venu-nexthop pushed a commit to venu-nexthop/sonic-mgmt that referenced this pull request Jan 13, 2026
…20326)

This is adding a new section to the tests_mark_conditions.yaml file so that common
conditions can be defined once, and then re-used in the rest of this file.

This section currently only defines lossyTopos, and this change uses that throughout
the tests_mark_conditions.yaml file.
venu-nexthop pushed a commit to venu-nexthop/sonic-mgmt that referenced this pull request Jan 13, 2026
…net#20642)

sonic-net#20326 was missing a "conditions_logical_operator: or", which this PR adds.

Since that PR has not merged to any branches yet, this only needed for master
wangxin added a commit to wangxin/sonic-mgmt that referenced this pull request Jan 15, 2026
PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <[email protected]>
wangxin added a commit that referenced this pull request Jan 15, 2026
PR #20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR #20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <[email protected]>
PriyanshTratiya pushed a commit to PriyanshTratiya/sonic-mgmt that referenced this pull request Jan 21, 2026
PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <[email protected]>
Signed-off-by: Priyansh Tratiya <[email protected]>
AndoniSanguesa pushed a commit to AndoniSanguesa/sonic-mgmt that referenced this pull request Jan 21, 2026
PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <[email protected]>
Signed-off-by: Andoni Sanguesa <[email protected]>
AndoniSanguesa pushed a commit to AndoniSanguesa/sonic-mgmt that referenced this pull request Jan 21, 2026
PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <[email protected]>
Signed-off-by: Andoni Sanguesa <[email protected]>
saravanan-nexthop pushed a commit to nexthop-ai/sonic-mgmt that referenced this pull request Jan 22, 2026
PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <[email protected]>
Signed-off-by: Saravanan Sellappa <[email protected]>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Jan 26, 2026
…t#20382)

Ensure pre-test is first item in conditional mark check, because pre-test runs before everything else, and it makes the most sense at the top of the file.

Also this change goes with sonic-net#20326
This change will allow that PR to pass its PR checks.

Signed-off-by: Guy Shemesh <[email protected]>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Jan 26, 2026
…20326)

This is adding a new section to the tests_mark_conditions.yaml file so that common
conditions can be defined once, and then re-used in the rest of this file.

This section currently only defines lossyTopos, and this change uses that throughout
the tests_mark_conditions.yaml file.

Signed-off-by: Guy Shemesh <[email protected]>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Jan 26, 2026
…net#20642)

sonic-net#20326 was missing a "conditions_logical_operator: or", which this PR adds.

Since that PR has not merged to any branches yet, this only needed for master

Signed-off-by: Guy Shemesh <[email protected]>
lakshmi-nexthop pushed a commit to lakshmi-nexthop/sonic-mgmt that referenced this pull request Jan 28, 2026
…t#20382)

Ensure pre-test is first item in conditional mark check, because pre-test runs before everything else, and it makes the most sense at the top of the file.

Also this change goes with sonic-net#20326
This change will allow that PR to pass its PR checks.

Signed-off-by: Lakshmi Yarramaneni <[email protected]>
lakshmi-nexthop pushed a commit to lakshmi-nexthop/sonic-mgmt that referenced this pull request Jan 28, 2026
…20326)

This is adding a new section to the tests_mark_conditions.yaml file so that common
conditions can be defined once, and then re-used in the rest of this file.

This section currently only defines lossyTopos, and this change uses that throughout
the tests_mark_conditions.yaml file.

Signed-off-by: Lakshmi Yarramaneni <[email protected]>
lakshmi-nexthop pushed a commit to lakshmi-nexthop/sonic-mgmt that referenced this pull request Jan 28, 2026
…net#20642)

sonic-net#20326 was missing a "conditions_logical_operator: or", which this PR adds.

Since that PR has not merged to any branches yet, this only needed for master

Signed-off-by: Lakshmi Yarramaneni <[email protected]>
ytzur1 pushed a commit to ytzur1/sonic-mgmt that referenced this pull request Feb 2, 2026
…t#20382)

Ensure pre-test is first item in conditional mark check, because pre-test runs before everything else, and it makes the most sense at the top of the file.

Also this change goes with sonic-net#20326
This change will allow that PR to pass its PR checks.

Signed-off-by: Yael Tzur <[email protected]>
ytzur1 pushed a commit to ytzur1/sonic-mgmt that referenced this pull request Feb 2, 2026
…20326)

This is adding a new section to the tests_mark_conditions.yaml file so that common
conditions can be defined once, and then re-used in the rest of this file.

This section currently only defines lossyTopos, and this change uses that throughout
the tests_mark_conditions.yaml file.

Signed-off-by: Yael Tzur <[email protected]>
ytzur1 pushed a commit to ytzur1/sonic-mgmt that referenced this pull request Feb 2, 2026
…net#20642)

sonic-net#20326 was missing a "conditions_logical_operator: or", which this PR adds.

Since that PR has not merged to any branches yet, this only needed for master

Signed-off-by: Yael Tzur <[email protected]>
ytzur1 pushed a commit to ytzur1/sonic-mgmt that referenced this pull request Feb 2, 2026
PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <[email protected]>
Signed-off-by: Yael Tzur <[email protected]>
abhishek-nexthop pushed a commit to nexthop-ai/sonic-mgmt that referenced this pull request Feb 6, 2026
PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <[email protected]>
nnelluri-cisco pushed a commit to nnelluri-cisco/sonic-mgmt that referenced this pull request Feb 12, 2026
PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <[email protected]>
Signed-off-by: nnelluri-cisco <[email protected]>
rraghav-cisco pushed a commit to rraghav-cisco/sonic-mgmt that referenced this pull request Feb 13, 2026
PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <[email protected]>
Signed-off-by: Raghavendran Ramanathan <[email protected]>
anilal-amd pushed a commit to anilal-amd/anilal-forked-sonic-mgmt that referenced this pull request Feb 19, 2026
PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <[email protected]>
Signed-off-by: Zhuohui Tan <[email protected]>
abhishek-nexthop pushed a commit to nexthop-ai/sonic-mgmt that referenced this pull request Mar 17, 2026
PR sonic-net#20326 introduced anchors in the conditional mark yaml files.
The anchors are defined in a dummy entry for test_pretest.py.

PR sonic-net#20382 updated code to add exception for the sort checking of test_pretest.py in conditional mark yaml files.

These changes made it complicated when we do need to skip something for test_pretest.py.

This change fixed the problem by using a real dummy entry for defining the yaml anchors.

The code of skipping test_pretest.py in sort checking in conditional mark yaml file is also removed.

This change also improved a variable name in conditional mark and fixed a few typos.

Signed-off-by: Xin Wang <[email protected]>
Signed-off-by: Abhishek <[email protected]>
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