Skip to content

Commit

Permalink
Add skip and skip reason
Browse files Browse the repository at this point in the history
  • Loading branch information
xwjiang-ms committed Jan 6, 2025
1 parent 7b9ccbe commit aa03891
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 8 deletions.
4 changes: 4 additions & 0 deletions .azure-pipelines/pr_test_skip_scripts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ t1-lag:
- system_health/test_system_health.py
# Vrf tests are also skipped in nightly test
- mvrf/test_mgmtvrf.py
# This test needs swap syncd support, which is not available on KVM
- qos/test_qos_masic.py

t2:
# KVM do not support bfd test
Expand Down Expand Up @@ -201,6 +203,8 @@ dualtor:
- dualtor_io/test_grpc_server_failure.py
# This test is only for Nvidia platforms.
- dualtor_mgmt/test_egress_drop_nvidia.py
# This test needs some additional SAI attributes, do not support on KVM.
- qos/test_tunnel_qos_remap.py

tgen:
# Ixia test only support on physical ixia testbed
Expand Down
23 changes: 15 additions & 8 deletions tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1645,11 +1645,12 @@ qos/test_qos_dscp_mapping.py::TestQoSSaiDSCPQueueMapping_IPIP_Base::test_dscp_to

qos/test_qos_masic.py:
skip:
reason: "QoS tests for multi-ASIC only. Supported topos: t1-lag, t1-64-lag, t1-56-lag, t1-backend. / M0/MX topo does not support qos"
reason: "QoS tests for multi-ASIC only. Supported topos: t1-lag, t1-64-lag, t1-56-lag, t1-backend. / M0/MX topo does not support qos. / KVM do not support swap syncd."
conditions_logical_operator: or
conditions:
- "is_multi_asic==False or topo_name not in ['t1-lag', 't1-8-lag', 't1-64-lag', 't1-56-lag', 't1-backend']"
- "is_multi_asic==False or topo_name not in ['t1-lag', 't1-64-lag', 't1-56-lag', 't1-backend']"
- "topo_type in ['m0', 'mx']"
- "asic_type in ['vs']"

qos/test_qos_sai.py:
skip:
Expand Down Expand Up @@ -1845,6 +1846,12 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiSharedReservationSize:
- "topo_type in ['m0', 'mx']"
- "topo_name not in ['t0', 't0-64', 't0-116', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']"

qos/test_tunnel_qos_remap.py:
skip:
reason: "Tunnel qos remap test needs some SAI attributes, which are not supported on KVM."
conditions:
- "asic_type in ['vs']"

qos/test_tunnel_qos_remap.py::test_pfc_watermark_extra_lossless_active:
xfail:
reason: "test_pfc_watermark_extra_lossless_active is not support on broadcom platform yet"
Expand Down Expand Up @@ -2310,19 +2317,19 @@ voq/test_fabric_reach.py:
- "not any(i in platform for i in ['arista_7800', 'x86_64-nokia_ixr7250e'])"
- "(asic_type in ['cisco-8000'])"

voq/test_voq_fabric_capacity.py:
skip:
reason: "Skip test_voq_fabric_capacity on unsupported testbed."
conditions:
- "('t2' not in topo_name) or (asic_subtype not in ['broadcom-dnx']) or (asic_type in ['cisco-8000'])"

voq/test_voq_counter.py::TestVoqCounter::test_voq_queue_counter[multi_dut_shortlink_to_longlink]:
skip:
reason: "Testcase ignored due to sonic-mgmt issue: https://github.com/sonic-net/sonic-buildimage/issues/21098"
conditions:
- "(switch_type=='voq')"
- "('t2' in topo_name)"

voq/test_voq_fabric_capacity.py:
skip:
reason: "Skip test_voq_fabric_capacity on unsupported testbed."
conditions:
- "('t2' not in topo_name) or (asic_subtype not in ['broadcom-dnx']) or (asic_type in ['cisco-8000'])"

voq/test_voq_fabric_isolation.py:
skip:
reason: "Skip test_voq_fabric_isolation on unsupported testbed."
Expand Down

0 comments on commit aa03891

Please sign in to comment.