Skip to content

Fix wrong skip condition in test_decap on 7260CX3 #11203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StormLiangMS merged 2 commits into from
Jan 5, 2024
Merged

Fix wrong skip condition in test_decap on 7260CX3 #11203

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
303744d
Fix wrong skip condition in test_decap on 7260CX3
wsycqyz Jan 5, 2024
35210ba
Modify skip reason.
wsycqyz Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,17 +250,20 @@ decap/test_decap.py::test_decap[ttl=pipe, dscp=pipe, vxlan=set_unset]:

decap/test_decap.py::test_decap[ttl=pipe, dscp=uniform, vxlan=disable]:
skip:
reason: "Not supported on backend , broadcom before 202012 release and innovium, x86_64-8111_32eh_o-r0 platform"
conditions_logical_operator: or
reason: "Not supported on backend, broadcom before 202012 release, innovium and x86_64-8111_32eh_o-r0 platform. Skip 7260CX3 T1 topo in 202305 release"
conditions:
- "(topo_name in ['t1-backend', 't0-backend']) or (asic_type in ['broadcom'] and release in ['201811', '201911']) or asic_type in ['innovium'] or platform in ['x86_64-8111_32eh_o-r0']"
- "'7260CX3' in hwsku and release in ['202305'] and 't1' in topo_type"

decap/test_decap.py::test_decap[ttl=pipe, dscp=uniform, vxlan=set_unset]:
skip:
reason: "Not supported on backend, T2 topologies , broadcom platforms before 202012 release and innovium, x86_64-8111_32eh_o-r0 platform. Skip on mellanox dualtor setups for github issue #9646"
reason: "Not supported on backend, T2 topologies , broadcom platforms before 202012 release, innovium, x86_64-8111_32eh_o-r0 platform. Skip on mellanox dualtor setups for github issue #9646. Skip on 7260CX3 T1 topo in 202305 release"
conditions_logical_operator: or
conditions:
- "('t2' in topo_name) or (topo_name in ['t1-backend', 't0-backend']) or (asic_type in ['broadcom'] and release in ['201811', '201911']) or asic_type in ['innovium'] or platform in ['x86_64-8111_32eh_o-r0']"
- "https://github.com/sonic-net/sonic-mgmt/issues/9646 and 'dualtor' in topo_name and asic_type in ['mellanox']"
- "'7260CX3' in hwsku and release in ['202305'] and 't1' in topo_type"

decap/test_decap.py::test_decap[ttl=uniform, dscp=pipe, vxlan=disable]:
skip:
Expand Down