Skip to content

Improve anchor definition in conditional mark#21943

Merged
wangxin merged 1 commit intosonic-net:masterfrom
wangxin:fix-conditional-mark-anchor
Jan 15, 2026
Merged

Improve anchor definition in conditional mark#21943
wangxin merged 1 commit intosonic-net:masterfrom
wangxin:fix-conditional-mark-anchor

Conversation

@wangxin
Copy link
Copy Markdown
Collaborator

@wangxin wangxin commented Jan 15, 2026

Description of PR

Summary:
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
  • 202505
  • 202511

Approach

What is the motivation for this PR?

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.

How did you do it?

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.

How did you verify/test it?

PR tests can cover the verification.

Any platform specific information?

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

Documentation

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 <xiwang5@microsoft.com>
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@wangxin wangxin merged commit 5c22743 into sonic-net:master Jan 15, 2026
21 checks passed
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 <xiwang5@microsoft.com>
Signed-off-by: Priyansh Tratiya <ptratiya@microsoft.com>
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 <xiwang5@microsoft.com>
Signed-off-by: Andoni Sanguesa <andoniesanguesa@gmail.com>
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 <xiwang5@microsoft.com>
Signed-off-by: Andoni Sanguesa <andoniesanguesa@gmail.com>
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 <xiwang5@microsoft.com>
Signed-off-by: Saravanan Sellappa <saravanan@nexthop.ai>
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 <xiwang5@microsoft.com>
Signed-off-by: Yael Tzur <ytzur@nvidia.com>
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 <xiwang5@microsoft.com>
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 <xiwang5@microsoft.com>
Signed-off-by: nnelluri-cisco <nnelluri@cisco.com>
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 <xiwang5@microsoft.com>
Signed-off-by: Raghavendran Ramanathan <rraghav@cisco.com>
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 <xiwang5@microsoft.com>
Signed-off-by: Zhuohui Tan <zhuohui.tan@amd.com>
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 <xiwang5@microsoft.com>
Signed-off-by: Abhishek <abhishek@nexthop.ai>
venu-nexthop pushed a commit to venu-nexthop/sonic-mgmt that referenced this pull request Mar 27, 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 <xiwang5@microsoft.com>
selldinesh pushed a commit to selldinesh/sonic-mgmt that referenced this pull request Apr 1, 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 <xiwang5@microsoft.com>
Signed-off-by: selldinesh <dinesh.sellappan@keysight.com>
opcoder0 pushed a commit to opcoder0/sonic-mgmt that referenced this pull request Apr 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 <xiwang5@microsoft.com>
Signed-off-by: opcoder0 <110003254+opcoder0@users.noreply.github.com>
rraghav-cisco pushed a commit to rraghav-cisco/sonic-mgmt that referenced this pull request Apr 20, 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 <xiwang5@microsoft.com>
Signed-off-by: Raghavendran Ramanathan <rraghav@cisco.com>
sudarshankumar4893 pushed a commit to sudarshankumar4893/pervnetbgp-tests that referenced this pull request Apr 20, 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 <xiwang5@microsoft.com>
Signed-off-by: Sudarshan Kumar (from Dev Box) <sudakumar@microsoft.com>
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.

3 participants