From d934e09af72ff601120a6e4fbd7a8cfba783b6a6 Mon Sep 17 00:00:00 2001 From: Yutong Zhang Date: Wed, 9 Oct 2024 16:53:12 +0800 Subject: [PATCH 1/2] bugfix --- .../tests_mark_conditions.yaml | 344 ++++++++++++------ .../tests_mark_conditions_platform_tests.yaml | 18 +- 2 files changed, 254 insertions(+), 108 deletions(-) diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml index f6012b519f..9711ff7268 100644 --- a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml +++ b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml @@ -76,15 +76,23 @@ bfd/test_bfd.py: bfd/test_bfd.py::test_bfd_basic: skip: - reason: "Test not supported for cisco as it doesnt support single hop BFD. Skipping the test" + reason: "Test not supported for cisco as it doesnt support single hop BFD + and not supported for platforms other than Nvidia 4600c/4700/5600. Skipping the test" + conditions_logical_operator: or conditions: - - "platform in ['x86_64-8102_64h_o-r0', 'x86_64-8101_32fh_o-r0', 'x86_64-8111_32eh_o-r0', 'x86_64-8122_64eh_o-r0', 'x86_64-8122_64ehf_o-r0']" + - "platform in ['x86_64-8102_64h_o-r0', 'x86_64-8101_32fh_o-r0', 'x86_64-8111_32eh_o-r0', 'x86_64-8122_64eh_o-r0', + 'x86_64-8122_64ehf_o-r0', 'x86_64-mlnx_msn4600c-r0', 'x86_64-mlnx_msn4700-r0', 'x86_64-nvidia_sn5600-r0']" + - "release in ['201811', '201911']" bfd/test_bfd.py::test_bfd_scale: skip: - reason: "Test not supported for cisco as it doesnt support single hop BFD. Skipping the test" + reason: "Test not supported for cisco as it doesnt support single hop BFD. + and not supported for platforms other than Nvidia 4600c/4700/5600. Skipping the test" + conditions_logical_operator: or conditions: - - "platform in ['x86_64-8102_64h_o-r0', 'x86_64-8101_32fh_o-r0', 'x86_64-8111_32eh_o-r0', 'x86_64-8122_64eh_o-r0', 'x86_64-8122_64ehf_o-r0']" + - "platform in ['x86_64-8102_64h_o-r0', 'x86_64-8101_32fh_o-r0', 'x86_64-8111_32eh_o-r0', 'x86_64-8122_64eh_o-r0', + 'x86_64-8122_64ehf_o-r0', 'x86_64-mlnx_msn4600c-r0', 'x86_64-mlnx_msn4700-r0', 'x86_64-nvidia_sn5600-r0']" + - "release in ['201811', '201911']" bfd/test_bfd_static_route.py: skip: @@ -143,10 +151,12 @@ bgp/test_bgp_slb.py: bgp/test_bgp_slb.py::test_bgp_slb_neighbor_persistence_across_advanced_reboot: skip: - reason: "Skip it on dual tor since it got stuck during warm reboot due to known issue on master and internal image" + reason: "Skip it on dual tor since it got stuck during warm reboot due to known issue on master and internal image + or over topologies which doesn't support slb." + conditions_logical_operator: or conditions: - - "topo_name in ['dualtor', 'dualtor-56', 'dualtor-120', 'dualtor-aa', 'dualtor-aa-56']" - - https://github.com/sonic-net/sonic-mgmt/issues/9201 + - "topo_name in ['dualtor', 'dualtor-56', 'dualtor-120', 'dualtor-aa', 'dualtor-aa-56'] and 'https://github.com/sonic-net/sonic-mgmt/issues/9201'" + - "'backend' in topo_name or 'mgmttor' in topo_name" bgp/test_bgp_speaker.py: skip: @@ -222,24 +232,30 @@ copp/test_copp.py: copp/test_copp.py::TestCOPP::test_add_new_trap: skip: - reason: "Copp test_add_new_trap is not yet supported on multi-asic platform" + reason: "Copp test_add_new_trap is not yet supported on these testbeds" + conditions_logical_operator: or conditions: - "is_multi_asic==True" + - "(topo_name not in ['ptf32', 'ptf64', 't0', 't0-64', 't0-52', 't0-116', 't1', 't1-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 'm0', 'm0-2vlan', 'mx'] and 't2' not in topo_type)" copp/test_copp.py::TestCOPP::test_remove_trap: skip: - reason: "Copp test_remove_trap is not yet supported on multi-asic platform" + reason: "Copp test_remove_trap is not yet supported on these testbeds" + conditions_logical_operator: or conditions: - "is_multi_asic==True" + - "(topo_name not in ['ptf32', 'ptf64', 't0', 't0-64', 't0-52', 't0-116', 't1', 't1-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 'm0', 'm0-2vlan', 'mx'] and 't2' not in topo_type)" copp/test_copp.py::TestCOPP::test_trap_config_save_after_reboot: skip: conditions_logical_operator: or - reason: "Copp test_trap_config_save_after_reboot is not yet supported on multi-asic platform or not supported after docker_inram enabled" + reason: "Copp test_trap_config_save_after_reboot is not yet supported on these testbeds or not supported after docker_inram enabled" conditions: - "is_multi_asic==True" - "build_version.split('.')[0].isdigit() and int(build_version.split('.')[0]) == 20220531 and int(build_version.split('.')[1]) > 27 and hwsku in ['Arista-7050-QX-32S', 'Arista-7050QX32S-Q32', 'Arista-7050-QX32', 'Arista-7050QX-32S-S4Q31', 'Arista-7060CX-32S-D48C8', 'Arista-7060CX-32S-C32', 'Arista-7060CX-32S-Q32', 'Arista-7060CX-32S-C32-T1']" - "build_version.split('.')[0].isdigit() and int(build_version.split('.')[0]) > 20220531 and hwsku in ['Arista-7050-QX-32S', 'Arista-7050QX32S-Q32', 'Arista-7050-QX32', 'Arista-7050QX-32S-S4Q31', 'Arista-7060CX-32S-D48C8', 'Arista-7060CX-32S-C32', 'Arista-7060CX-32S-Q32', 'Arista-7060CX-32S-C32-T1']" + - "(topo_name not in ['ptf32', 'ptf64', 't0', 't0-64', 't0-52', 't0-116', 't1', 't1-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 'm0', 'm0-2vlan', 'mx'] and 't2' not in topo_type)" + ####################################### ##### crm ##### @@ -317,27 +333,34 @@ dhcp_relay/test_dhcp_relay.py: dhcp_relay/test_dhcp_relay.py::test_dhcp_relay_after_link_flap: skip: - reason: "Skip test_dhcp_relay_after_link_flap on dualtor" + reason: "Skip test_dhcp_relay_after_link_flap on dualtor or platform x86_64-8111_32eh_o-r0" + conditions_logical_operator: or conditions: - "'dualtor' in topo_name" + - "platform in ['x86_64-8111_32eh_o-r0']" dhcp_relay/test_dhcp_relay.py::test_dhcp_relay_random_sport: skip: - reason: "Skip test_dhcp_relay_random_sport on dualtor in 201811 and 201911" + reason: "Skip test_dhcp_relay_random_sport on dualtor in 201811 and 201911 or platform x86_64-8111_32eh_o-r0" conditions: - "'dualtor' in topo_name and release in ['201811', '201911']" + - "platform in ['x86_64-8111_32eh_o-r0']" dhcp_relay/test_dhcp_relay.py::test_dhcp_relay_start_with_uplinks_down: skip: - reason: "Skip test_dhcp_relay_start_with_uplinks_down on dualtor" + reason: "Skip test_dhcp_relay_start_with_uplinks_down on dualtor or platform x86_64-8111_32eh_o-r0" + conditions_logical_operator: or conditions: - "'dualtor' in topo_name" + - "platform in ['x86_64-8111_32eh_o-r0']" dhcp_relay/test_dhcp_relay.py::test_dhcp_relay_unicast_mac: skip: - reason: "Skip test_dhcp_relay_unicast_mac on dualtor" + reason: "Skip test_dhcp_relay_unicast_mac on dualtor or platform x86_64-8111_32eh_o-r0" + conditions_logical_operator: or conditions: - "'dualtor' in topo_name and release in ['201811', '201911']" + - "platform in ['x86_64-8111_32eh_o-r0']" dhcp_relay/test_dhcpv6_relay.py: skip: @@ -378,9 +401,12 @@ dualtor/test_orchagent_active_tor_downstream.py: dualtor/test_orchagent_active_tor_downstream.py::test_downstream_ecmp_nexthops: skip: - reason: "On Mellanox SPC1 platforms, due to HW limitation, the hierarchy ecmp behavior is not exactly as expected in the test case." + reason: "On Mellanox SPC1 platforms, due to HW limitation, the hierarchy ecmp behavior is not exactly as expected + in the test case. / This testcase is designed for single tor testbed with mock dualtor config." + conditions_logical_operator: or conditions: - "asic_gen == 'spc1'" + - "(topo_type not in ['t0']) or ('dualtor' in topo_name)" dualtor/test_orchagent_mac_move.py: skip: @@ -470,9 +496,11 @@ dualtor_io: dualtor_io/test_link_failure.py::test_active_link_admin_down_config_reload_link_up_downstream_standby[active-active]: xfail: reason: "Testcase ignored on mellanox setups due to github issue: https://github.com/sonic-net/sonic-buildimage/issues/16161" + conditions_logical_operator: or conditions: - "https://github.com/sonic-net/sonic-buildimage/issues/16161 and asic_type in ['mellanox']" + dualtor_io/test_link_failure.py::test_active_link_down_downstream_active: xfail: reason: "Testcase ignored on Nvidia platforms due to github issue: https://github.com/sonic-net/sonic-mgmt/issues/8272" @@ -480,9 +508,9 @@ dualtor_io/test_link_failure.py::test_active_link_down_downstream_active: - https://github.com/sonic-net/sonic-mgmt/issues/8272 - "asic_type in ['mellanox']" skip: - reason: "KVM testbed do not support shutdown fanout interface action" + reason: "KVM testbed do not support shutdown fanout interface action / Testcase could only be executed on dualtor testbed." conditions: - - "asic_type in ['vs']" + - "asic_type in ['vs'] or 'dualtor' not in topo_name" dualtor_io/test_link_failure.py::test_active_link_down_downstream_active_soc: xfail: @@ -491,9 +519,9 @@ dualtor_io/test_link_failure.py::test_active_link_down_downstream_active_soc: - https://github.com/sonic-net/sonic-mgmt/issues/8272 - "asic_type in ['mellanox']" skip: - reason: "KVM testbed do not support shutdown fanout interface action" + reason: "KVM testbed do not support shutdown fanout interface action / Testcase could only be executed on dualtor testbed." conditions: - - "asic_type in ['vs']" + - "asic_type in ['vs'] or 'dualtor' not in topo_name" dualtor_io/test_link_failure.py::test_active_link_down_downstream_standby: xfail: @@ -502,39 +530,39 @@ dualtor_io/test_link_failure.py::test_active_link_down_downstream_standby: - https://github.com/sonic-net/sonic-mgmt/issues/8272 - "asic_type in ['mellanox']" skip: - reason: "KVM testbed do not support shutdown fanout interface action" + reason: "KVM testbed do not support shutdown fanout interface action / Testcase could only be executed on dualtor testbed." conditions: - - "asic_type in ['vs']" + - "asic_type in ['vs'] or 'dualtor' not in topo_name" dualtor_io/test_link_failure.py::test_active_link_down_upstream: skip: - reason: "KVM testbed do not support shutdown fanout interface action" + reason: "KVM testbed do not support shutdown fanout interface action / Testcase could only be executed on dualtor testbed." conditions: - - "asic_type in ['vs']" + - "asic_type in ['vs'] or 'dualtor' not in topo_name" dualtor_io/test_link_failure.py::test_active_link_down_upstream_soc: skip: - reason: "KVM testbed do not support shutdown fanout interface action" + reason: "KVM testbed do not support shutdown fanout interface action / Testcase could only be executed on dualtor testbed." conditions: - - "asic_type in ['vs']" + - "asic_type in ['vs'] or 'dualtor' not in topo_name" dualtor_io/test_link_failure.py::test_standby_link_down_downstream_active: skip: - reason: "KVM testbed do not support shutdown fanout interface action" + reason: "KVM testbed do not support shutdown fanout interface action / Testcase could only be executed on dualtor testbed." conditions: - - "asic_type in ['vs']" + - "asic_type in ['vs'] or 'dualtor' not in topo_name" dualtor_io/test_link_failure.py::test_standby_link_down_downstream_standby: skip: - reason: "KVM testbed do not support shutdown fanout interface action" + reason: "KVM testbed do not support shutdown fanout interface action / Testcase could only be executed on dualtor testbed." conditions: - - "asic_type in ['vs']" + - "asic_type in ['vs'] or 'dualtor' not in topo_name" dualtor_io/test_link_failure.py::test_standby_link_down_upstream: skip: - reason: "KVM testbed do not support shutdown fanout interface action" + reason: "KVM testbed do not support shutdown fanout interface action / Testcase could only be executed on dualtor testbed." conditions: - - "asic_type in ['vs']" + - "asic_type in ['vs'] or 'dualtor' not in topo_name" ####################################### ##### dut_console ##### @@ -630,20 +658,32 @@ everflow/test_everflow_per_interface.py: everflow/test_everflow_per_interface.py::test_everflow_per_interface[ipv6-default]: skip: reason: "Skip everflow per interface IPv6 test on unsupported platforms" + conditions_logical_operator: or conditions: - "asic_type in ['cisco-8000', 'marvell', 'mellanox'] or (asic_subtype in ['broadcom-dnx'] and https://github.com/sonic-net/sonic-swss/issues/2204)" + - "'dualtor' in topo_name" + - "platform in ['x86_64-8800_lc_48h_o-r0', 'x86_64-8800_lc_48h-r0']" + - "(is_multi_asic==True) and https://github.com/sonic-net/sonic-buildimage/issues/11776" everflow/test_everflow_per_interface.py::test_everflow_per_interface[ipv6-m0_l3_scenario]: skip: - reason: "Skip m0 everflow per interface IPv6 test on marvell" + reason: "Skip m0 everflow per interface IPv6 test on unsupported platforms" + conditions_logical_operator: or conditions: - "asic_type in ['marvell']" + - "'dualtor' in topo_name" + - "platform in ['x86_64-8800_lc_48h_o-r0', 'x86_64-8800_lc_48h-r0']" + - "(is_multi_asic==True) and https://github.com/sonic-net/sonic-buildimage/issues/11776" everflow/test_everflow_per_interface.py::test_everflow_per_interface[ipv6-m0_vlan_scenario]: skip: - reason: "Skip m0 everflow per interface IPv6 test on marvell" + reason: "Skip m0 everflow per interface IPv6 test on unsupported platforms" + conditions_logical_operator: or conditions: - "asic_type in ['marvell']" + - "'dualtor' in topo_name" + - "platform in ['x86_64-8800_lc_48h_o-r0', 'x86_64-8800_lc_48h-r0']" + - "(is_multi_asic==True) and https://github.com/sonic-net/sonic-buildimage/issues/11776" everflow/test_everflow_testbed.py::EverflowIPv4Tests::test_everflow_dscp_with_policer: skip: @@ -703,86 +743,100 @@ generic_config_updater: generic_config_updater/test_dhcp_relay.py: skip: - reason: "Need to skip for platform x86_64-8111_32eh_o-r0 or backend topology" + reason: "Need to skip for platform x86_64-8111_32eh_o-r0 or backend topology / generic_config_updater is not a supported feature for T2" conditions_logical_operator: "OR" conditions: - "platform in ['x86_64-8111_32eh_o-r0']" - "'backend' in topo_name" + - "'t2' in topo_name" generic_config_updater/test_dynamic_acl.py: skip: reason: "Device SKUs do not support the custom ACL_TABLE_TYPE that we use in this test. Known log error unrelated to test - on m0-2vlan testbed causes consistent failures" + on m0-2vlan testbed causes consistent failures / generic_config_updater is not a supported feature for T2" conditions_logical_operator: "OR" conditions: - "release in ['202311', '202405'] and platform in ['armhf-nokia_ixs7215_52x-r0']" - "hwsku in ['Cisco-8111-O64']" - "topo_name in ['m0-2vlan']" + - "'t2' in topo_name" generic_config_updater/test_ecn_config_update.py::test_ecn_config_updates: skip: - reason: "This test is not run on this asic type, topology, or version currently" + reason: "This test is not run on this asic type, topology, or version currently / generic_config_updater is not a supported feature for T2" conditions_logical_operator: "OR" conditions: - "asic_type in ['cisco-8000']" - "topo_type in ['m0', 'mx']" - "release in ['202211']" + - "'t2' in topo_name" generic_config_updater/test_eth_interface.py::test_replace_fec: skip: - reason: 'Skipping test on 7260/3800 platform due to bug of https://github.com/sonic-net/sonic-mgmt/issues/11237' + reason: 'Skipping test on 7260/3800 platform due to bug of https://github.com/sonic-net/sonic-mgmt/issues/11237 + / generic_config_updater is not a supported feature for T2' + conditions_logical_operator: "OR" conditions: - - "hwsku in ['Arista-7260CX3-D108C8', 'Arista-7260CX3-Q64', 'Mellanox-SN3800-D112C8']" - - https://github.com/sonic-net/sonic-mgmt/issues/11237 + - "hwsku in ['Arista-7260CX3-D108C8', 'Arista-7260CX3-Q64', 'Mellanox-SN3800-D112C8'] and 'https://github.com/sonic-net/sonic-mgmt/issues/11237'" + - "'t2' in topo_name" generic_config_updater/test_eth_interface.py::test_toggle_pfc_asym: skip: reason: "Skip asym pfc on unsupported platforms" + conditions_logical_operator: "OR" conditions: - "asic_type in ['cisco-8000']" + - "'t2' in topo_name" generic_config_updater/test_eth_interface.py::test_update_speed: skip: - reason: 'Skip this script due to this not being a production scenario and misleading StateDB output for valid speed' + reason: 'Skip this script due to this not being a production scenario and misleading StateDB output for valid speed / generic_config_updater is not a supported feature for T2' conditions_logical_operator: "OR" conditions: - https://github.com/sonic-net/sonic-mgmt/issues/8143 - https://github.com/sonic-net/sonic-buildimage/issues/13267 + - "'t2' in topo_name" generic_config_updater/test_incremental_qos.py: skip: - reason: "Does not support dualtor right now, due to issue https://github.com/sonic-net/sonic-mgmt/issues/14865" + reason: "Does not support dualtor right now, due to issue https://github.com/sonic-net/sonic-mgmt/issues/14865 + / generic_config_updater is not a supported feature for T2" + conditions_logical_operator: "OR" conditions: - "'dualtor' in topo_name" + - "'t2' in topo_name" generic_config_updater/test_incremental_qos.py::test_incremental_qos_config_updates: skip: - reason: "This test is not run on this hwsku/asic type or version currently" + reason: "This test is not run on this hwsku/asic type or version or topology currently" + conditions_logical_operator: "OR" conditions: - - "not any(i in hwsku for i in ['2700', 'Arista-7170-64C', 'montara', 'newport'])" - - "asic_type in ['broadcom', 'cisco-8000']" - - "release in ['202211']" + - "not any(i in hwsku for i in ['2700', 'Arista-7170-64C', 'montara', 'newport']) and asic_type in ['broadcom', 'cisco-8000'] and release in ['202211']" + - "'t2' in topo_name" generic_config_updater/test_mmu_dynamic_threshold_config_update.py::test_dynamic_th_config_updates: skip: - reason: "This test is not run on this asic type or version currently" + reason: "This test is not run on this asic type or version or topology currently" + conditions_logical_operator: "OR" conditions: - - "asic_type in ['broadcom', 'cisco-8000']" - - "release in ['202211']" + - "asic_type in ['broadcom', 'cisco-8000'] and release in ['202211']" + - "'t2' in topo_name" generic_config_updater/test_pfcwd_status.py: skip: - reason: "This test is not run on this topo type or version currently" + reason: "This test is not run on this topo type or version or topology currently" conditions_logical_operator: "OR" conditions: - "topo_type in ['m0', 'mx']" - "release in ['202211']" + - "'t2' in topo_name" generic_config_updater/test_pg_headroom_update.py: skip: reason: "Unsupported topology." conditions: - "topo_type in ['m0', 'mx']" + - "'t2' in topo_name" ####################################### ##### hash ##### @@ -955,15 +1009,20 @@ ip/test_ip_packet.py: ip/test_ip_packet.py::TestIPPacket::test_forward_ip_packet_with_0xffff_chksum_drop: skip: - reason: "Broadcom, Cisco, Barefoot, Innovium and Marvell Asic will tolorate IP packets with 0xffff checksum" + reason: "Broadcom, Cisco, Barefoot, Innovium and Marvell Asic will tolorate IP packets with 0xffff checksum + / Skipping ip packet test since can't provide enough interfaces" + conditions_logical_operator: or conditions: - "asic_type in ['broadcom', 'cisco-8000', 'marvell', 'barefoot', 'innovium'] and asic_subtype not in ['broadcom-dnx']" + - "len(minigraph_interfaces) < 2 and len(minigraph_portchannels) < 2" ip/test_ip_packet.py::TestIPPacket::test_forward_ip_packet_with_0xffff_chksum_tolerant: skip: - reason: "Mellanox and Broadcom DNX Asic will drop IP packets with 0xffff checksum" + reason: "Mellanox and Broadcom DNX Asic will drop IP packets with 0xffff checksum + / Skipping ip packet test since can't provide enough interfaces" conditions: - "asic_type in ['mellanox'] or asic_subtype in ['broadcom-dnx']" + - "len(minigraph_interfaces) < 2 and len(minigraph_portchannels) < 2" ip/test_mgmt_ipv6_only.py: skip: @@ -1099,14 +1158,18 @@ pc/test_po_cleanup.py: pc/test_po_update.py::test_po_update: skip: reason: "Skip test due to there is no portchannel or no portchannel member exists in current topology." + conditions_logical_operator: or conditions: - "len(minigraph_portchannels) == 0 or len(minigraph_portchannels[list(minigraph_portchannels.keys())[0]]['members']) == 0" + - "len(minigraph_portchannels) == 0 and not is_multi_asic" pc/test_po_update.py::test_po_update_io_no_loss: skip: reason: "Skip test due to there isn't enough port channel exists in current topology." + conditions_logical_operator: or conditions: - "len(minigraph_portchannel_interfaces) < 2" + - "len(minigraph_portchannels) == 0 and not is_multi_asic" pc/test_po_voq.py: skip: @@ -1149,28 +1212,37 @@ pfcwd: pfcwd/test_pfc_config.py::TestPfcConfig::test_forward_action_cfg: skip: - reason: "Forward action not supported in cisco-8000" + reason: "Forward action not supported in cisco-8000/m0/mx" + conditions_logical_operator: or conditions: - "asic_type in ['cisco-8000']" + - "topo_type in ['m0', 'mx']" pfcwd/test_pfcwd_all_port_storm.py: skip: reason: "Slow pfc generation rate on 7060x6 200Gb, - pfc generation function on the Arista fanout device need to be improved by Arista" + pfc generation function on the Arista fanout device need to be improved by Arista + / Pfcwd tests skipped on m0/mx testbed." + conditions_logical_operator: or conditions: - "hwsku in ['Arista-7060X6-64PE-256x200G']" + - "topo_type in ['m0', 'mx']" pfcwd/test_pfcwd_function.py::TestPfcwdFunc::test_pfcwd_no_traffic: skip: - reason: "This test is applicable only for cisco-8000" + reason: "This test is applicable only for cisco-8000 / Pfcwd tests skipped on m0/mx testbed." + conditions_logical_operator: or conditions: - "asic_type != 'cisco-8000'" + - "topo_type in ['m0', 'mx']" pfcwd/test_pfcwd_warm_reboot.py: skip: - reason: "Warm Reboot is not supported in T2." + reason: "Warm Reboot is not supported in T2. / Pfcwd tests skipped on m0/mx testbed." + conditions_logical_operator: or conditions: - "'t2' in topo_name" + - "topo_type in ['m0', 'mx']" xfail: reason: "Warm Reboot is not supported in dualtor and has a known issue on 202305 branch" conditions: @@ -1197,21 +1269,27 @@ qos: qos/test_buffer.py: skip: - reason: "These tests don't apply to cisco 8000 platforms or T2, since they support only traditional model." + reason: "These tests don't apply to cisco 8000 platforms or T2 or m0/mx, since they support only traditional model." + conditions_logical_operator: or conditions: - "asic_type in ['cisco-8000'] or 't2' in topo_name" + - "topo_type in ['m0', 'mx']" qos/test_buffer.py::test_buffer_model_test: skip: - reason: "Running only on mellanox devices and covered by unit testing" + reason: "Running only on mellanox devices and covered by unit testing / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - "asic_type in ['mellanox']" + - "topo_type in ['m0', 'mx']" qos/test_buffer_traditional.py: skip: - reason: "Buffer traditional test is only supported 201911 branch" + reason: "Buffer traditional test is only supported 201911 branch / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - "release not in ['201911']" + - "topo_type in ['m0', 'mx']" qos/test_pfc_pause.py::test_pfc_pause_lossless: # For this test, we use the fanout connected to the DUT to send PFC pause frames. @@ -1224,101 +1302,129 @@ qos/test_pfc_pause.py::test_pfc_pause_lossless: qos/test_qos_dscp_mapping.py::TestQoSSaiDSCPQueueMapping_IPIP_Base::test_dscp_to_queue_mapping_pipe_mode: skip: - reason: "Pipe decap mode not supported due to either SAI or platform limitation" + reason: "Pipe decap mode not supported due to either SAI or platform limitation / M0/MX topo does not support qos" conditions_logical_operator: or conditions: - "asic_type in ['mellanox', 'broadcom', 'cisco-8000']" - https://github.com/sonic-net/sonic-mgmt/issues/12906 + - "topo_type in ['m0', 'mx']" 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." + 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" + conditions_logical_operator: or conditions: - "is_multi_asic==False or topo_name not in ['t1-lag', 't1-64-lag', 't1-56-lag', 't1-backend']" + - "topo_type in ['m0', 'mx']" qos/test_qos_sai.py: skip: - reason: "qos_sai tests not supported on t1 topo" + reason: "qos_sai tests not supported on t1 topo / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - "asic_type in ['barefoot'] and topo_name in ['t1']" + - "topo_type in ['m0', 'mx']" qos/test_qos_sai.py::TestQosSai: skip: - reason: "Unsupported testbed type." + reason: "Unsupported testbed type. / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - "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']" + - "topo_type in ['m0', 'mx']" qos/test_qos_sai.py::TestQosSai::testIPIPQosSaiDscpToPgMapping: skip: - reason: "For DSCP to PG mapping on IPinIP traffic , mellanox device has different behavior to community. For mellanox device, testQosSaiDscpToPgMapping can cover the scenarios" + reason: "For DSCP to PG mapping on IPinIP traffic , mellanox device has different behavior to community. For mellanox device, testQosSaiDscpToPgMapping can cover the scenarios / M0/MX topo does not support qos" conditions_logical_operator: or conditions: - "asic_type in ['mellanox']" - https://github.com/sonic-net/sonic-mgmt/issues/12906 + - "topo_type in ['m0', 'mx']" qos/test_qos_sai.py::TestQosSai::testPfcStormWithSharedHeadroomOccupancy: skip: - reason: "This test is only for Mellanox." + reason: "This test is only for Mellanox. / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - "asic_type in ['cisco-8000']" + - "topo_type in ['m0', 'mx']" qos/test_qos_sai.py::TestQosSai::testQosSaiBufferPoolWatermark: skip: - reason: "sai_thrift_read_buffer_pool_watermark are not supported on DNX" + reason: "sai_thrift_read_buffer_pool_watermark are not supported on DNX / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - "platform in ['x86_64-nokia_ixr7250e_36x400g-r0', 'x86_64-arista_7800r3_48cq2_lc', 'x86_64-arista_7800r3_48cqm2_lc', 'x86_64-arista_7800r3a_36d2_lc', 'x86_64-arista_7800r3a_36dm2_lc','x86_64-arista_7800r3ak_36dm2_lc']" + - "topo_type in ['m0', 'mx']" qos/test_qos_sai.py::TestQosSai::testQosSaiDot1pPgMapping: skip: - reason: "Dot1p-PG mapping is only supported on backend." + reason: "Dot1p-PG mapping is only supported on backend. / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - "'backend' not in topo_name" + - "topo_type in ['m0', 'mx']" qos/test_qos_sai.py::TestQosSai::testQosSaiDot1pQueueMapping: skip: - reason: "Dot1p-queue mapping is only supported on backend." + reason: "Dot1p-queue mapping is only supported on backend. / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - "'backend' not in topo_name" + - "topo_type in ['m0', 'mx']" qos/test_qos_sai.py::TestQosSai::testQosSaiDscpQueueMapping: skip: - reason: "Dscp-queue mapping is not supported on backend." + reason: "Dscp-queue mapping is not supported on backend. / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - "'backend' in topo_name" + - "topo_type in ['m0', 'mx']" qos/test_qos_sai.py::TestQosSai::testQosSaiDscpToPgMapping: skip: - reason: "Dscp-PG mapping is not supported on backend." + reason: "Dscp-PG mapping is not supported on backend. / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - "'backend' in topo_name" + - "topo_type in ['m0', 'mx']" qos/test_qos_sai.py::TestQosSai::testQosSaiDwrrWeightChange: skip: - reason: "Skip DWRR weight change test on Mellanox platform." + reason: "Skip DWRR weight change test on Mellanox platform. / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - "asic_type in ['mellanox']" + - "topo_type in ['m0', 'mx']" qos/test_qos_sai.py::TestQosSai::testQosSaiFullMeshTrafficSanity: skip: - reason: "Unsupported platform or testbed type." + reason: "Unsupported platform or testbed type. / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - "asic_type not in ['cisco-8000'] or topo_name not in ['ptf64']" + - "topo_type in ['m0', 'mx']" qos/test_qos_sai.py::TestQosSai::testQosSaiHeadroomPoolSize: skip: - reason: "Headroom pool size not supported." + reason: "Headroom pool size not supported. / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - - "https://github.com/sonic-net/sonic-mgmt/issues/12292 and hwsku in ['Force10-S6100'] and topo_type in ['t1-64-lag']" - - "hwsku not in ['Arista-7060CX-32S-C32', 'Celestica-DX010-C32', 'Arista-7260CX3-D108C8', 'Force10-S6100', 'Arista-7260CX3-Q64', 'Arista-7050CX3-32S-C32', 'Arista-7050CX3-32S-D48C8', 'Arista-7060CX-32S-D48C8'] and asic_type not in ['mellanox']" - - "asic_type in ['cisco-8000']" + - "https://github.com/sonic-net/sonic-mgmt/issues/12292 and hwsku in ['Force10-S6100'] + and topo_type in ['t1-64-lag'] and hwsku not in ['Arista-7060CX-32S-C32', 'Celestica-DX010-C32', 'Arista-7260CX3-D108C8', 'Force10-S6100', 'Arista-7260CX3-Q64', 'Arista-7050CX3-32S-C32', 'Arista-7050CX3-32S-D48C8', 'Arista-7060CX-32S-D48C8'] and asic_type not in ['mellanox'] + and asic_type in ['cisco-8000']" + - "topo_type in ['m0', 'mx']" qos/test_qos_sai.py::TestQosSai::testQosSaiHeadroomPoolWatermark: skip: - reason: "sai_thrift_read_buffer_pool_watermark are not supported on DNX" + reason: "sai_thrift_read_buffer_pool_watermark are not supported on DNX / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - - "platform in ['x86_64-nokia_ixr7250e_36x400g-r0', 'x86_64-arista_7800r3_48cq2_lc', 'x86_64-arista_7800r3_48cqm2_lc', 'x86_64-arista_7800r3a_36d2_lc', 'x86_64-arista_7800r3a_36dm2_lc', 'x86_64-arista_7800r3ak_36dm2_lc'] or asic_type in ['mellanox']" - - "asic_type in ['cisco-8000']" - - "https://github.com/sonic-net/sonic-mgmt/issues/12292 and hwsku in ['Force10-S6100'] and topo_type in ['t1-64-lag']" + - "platform in ['x86_64-nokia_ixr7250e_36x400g-r0', 'x86_64-arista_7800r3_48cq2_lc', 'x86_64-arista_7800r3_48cqm2_lc', 'x86_64-arista_7800r3a_36d2_lc', 'x86_64-arista_7800r3a_36dm2_lc', 'x86_64-arista_7800r3ak_36dm2_lc'] or asic_type in ['mellanox'] + and asic_type in ['cisco-8000'] + and https://github.com/sonic-net/sonic-mgmt/issues/12292 and hwsku in ['Force10-S6100'] and topo_type in ['t1-64-lag']" + - "topo_type in ['m0', 'mx']" xfail: reason: "Headroom pool size not supported." conditions: @@ -1326,33 +1432,44 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiHeadroomPoolWatermark: qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq: skip: - reason: "Lossless Voq test is not supported" + reason: "Lossless Voq test is not supported / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - "asic_type not in ['cisco-8000'] or platform in ['x86_64-8122_64eh_o-r0']" + - "topo_type in ['m0', 'mx']" qos/test_qos_sai.py::TestQosSai::testQosSaiLossyQueueVoq: skip: - reason: "Lossy Queue Voq test is not supported" + reason: "Lossy Queue Voq test is not supported / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - "asic_type not in ['cisco-8000'] or platform in ['x86_64-8122_64eh_o-r0']" + - "topo_type in ['m0', 'mx']" qos/test_qos_sai.py::TestQosSai::testQosSaiLossyQueueVoqMultiSrc: skip: - reason: "Lossy Queue Voq multiple source test is not supported" + reason: "Lossy Queue Voq multiple source test is not supported / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - "asic_type not in ['cisco-8000']" + - "topo_type in ['m0', 'mx']" qos/test_qos_sai.py::TestQosSai::testQosSaiPGDrop: skip: - reason: "PG drop size test is not supported." + reason: "PG drop size test is not supported. / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - "asic_type not in ['cisco-8000'] or platform in ['x86_64-8122_64eh_o-r0']" + - "topo_type in ['m0', 'mx']" qos/test_qos_sai.py::TestQosSai::testQosSaiPgHeadroomWatermark: skip: - reason: "Priority Group Headroom Watermark is not supported on cisco asic. PG drop counter stat is covered as a part of testQosSaiPfcXoffLimit" + reason: "Priority Group Headroom Watermark is not supported on cisco asic. PG drop counter stat is covered as a part of testQosSaiPfcXoffLimit + / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - "asic_type in ['cisco-8000'] and platform not in ['x86_64-8122_64eh_o-r0']" + - "topo_type in ['m0', 'mx']" qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[None-wm_pg_shared_lossy]: xfail: @@ -1362,15 +1479,19 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[None-wm_pg_shared_l qos/test_qos_sai.py::TestQosSai::testQosSaiQWatermarkAllPorts: skip: - reason: "All Port Watermark test is verified only on Cisco Platforms." + reason: "All Port Watermark test is verified only on Cisco Platforms. / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - "asic_type not in ['cisco-8000']" + - "topo_type in ['m0', 'mx']" qos/test_qos_sai.py::TestQosSai::testQosSaiSharedReservationSize: skip: - reason: "Shared reservation size test is not supported." + reason: "Shared reservation size test is not supported. / M0/MX topo does not support qos" + conditions_logical_operator: or conditions: - "asic_type not in ['cisco-8000'] or platform in ['x86_64-8122_64eh_o-r0']" + - "topo_type in ['m0', 'mx']" qos/test_tunnel_qos_remap.py::test_pfc_watermark_extra_lossless_active: xfail: @@ -1422,8 +1543,10 @@ restapi/test_restapi.py: restapi/test_restapi.py::test_create_vrf: skip: reason: "Only supported on Mellanox T1" + conditions_logical_operator: or conditions: - "'t1' not in topo_type" + - "asic_type not in ['mellanox']" restapi/test_restapi_vxlan_ecmp.py: skip: @@ -1467,8 +1590,12 @@ route/test_static_route.py::test_static_route_ecmp_ipv6: # This test case may fail due to a known issue https://github.com/sonic-net/sonic-buildimage/issues/4930. # Temporarily disabling the test case due to the this issue. skip: - reason: "Test case may fail due to a known issue" - conditions: https://github.com/sonic-net/sonic-buildimage/issues/4930 + reason: "Test case may fail due to a known issue / Test not supported for 201911 images or older. Does not apply to standalone topos." + conditions_logical_operator: OR + conditions: + - "https://github.com/sonic-net/sonic-buildimage/issues/4930" + - "release in ['201811', '201911']" + - "'standalone' in topo_name" ####################################### ##### show_techsupport ##### @@ -1488,9 +1615,11 @@ show_techsupport/test_auto_techsupport.py::TestAutoTechSupport::test_max_limit[c show_techsupport/test_auto_techsupport.py::TestAutoTechSupport::test_sai_sdk_dump: skip: - reason: "Test supported only on Nvidia(Mellanox) devices" + reason: "Test supported only on Nvidia(Mellanox) devices / auto techsupport on multi asic platforms doesnt work" + conditions_logical_operator: or conditions: - "asic_type not in ['mellanox']" + - "is_multi_asic==True" ####################################### ##### snappi_tests ##### @@ -1586,10 +1715,11 @@ sub_port_interfaces: sub_port_interfaces/test_show_subinterface.py::test_subinterface_status[port]: skip: - reason: "There is an image issue on kvm testbed" + reason: "Unsupported platform or asic" + conditions_logical_operator: or conditions: - - asic_type in ['vs'] - - https://github.com/sonic-net/sonic-buildimage/issues/19735 + - "asic_type in ['vs'] and https://github.com/sonic-net/sonic-buildimage/issues/19735" + - "is_multi_asic==True or asic_gen not in ['td2', 'spc1', 'spc2', 'spc3', 'spc4'] and asic_type not in ['barefoot','innovium']" sub_port_interfaces/test_show_subinterface.py::test_subinterface_status[port_in_lag]: skip: @@ -1601,9 +1731,11 @@ sub_port_interfaces/test_sub_port_interfaces.py::TestSubPorts::test_routing_betw sub_port_interfaces/test_sub_port_interfaces.py::TestSubPorts::test_tunneling_between_sub_ports: skip: - reason: "Cisco 8000 platform does not support DSCP PIPE Mode for IPinIP Tunnels" + reason: "Cisco 8000 platform does not support DSCP PIPE Mode for IPinIP Tunnels / Unsupported platform or asic" + conditions_logical_operator: or conditions: - "asic_type=='cisco-8000'" + - "is_multi_asic==True or asic_gen not in ['td2', 'spc1', 'spc2', 'spc3', 'spc4'] and asic_type not in ['barefoot','innovium']" sub_port_interfaces/test_sub_port_interfaces.py::TestSubPorts::test_untagged_packet_not_routed[port_in_lag] : skip: @@ -1631,15 +1763,19 @@ syslog/test_syslog_source_ip.py: syslog/test_syslog_source_ip.py::TestSSIP::test_syslog_config_work_after_reboot: skip: - reason: "Testcase consistent failed, raised issue to track" + reason: "Testcase consistent failed, raised issue to track / Vs setup doesn't work when creating mgmt vrf" + conditions_logical_operator: or conditions: - - https://github.com/sonic-net/sonic-buildimage/issues/19638 + - "https://github.com/sonic-net/sonic-buildimage/issues/19638" + - "asic_type in ['vs']" syslog/test_syslog_source_ip.py::TestSSIP::test_syslog_protocol_filter_severity: skip: - reason: "Testcase consistent failed, raised issue to track" + reason: "Testcase consistent failed, raised issue to track / Vs setup doesn't work when creating mgmt vrf" + conditions_logical_operator: or conditions: - - https://github.com/sonic-net/sonic-mgmt/issues/14493 + - "https://github.com/sonic-net/sonic-mgmt/issues/14493" + - "asic_type in ['vs']" ####################################### ##### system_health ##### @@ -1728,25 +1864,25 @@ voq/test_fabric_cli_and_db.py: skip: reason: "Skip test_fabric_cli_and_db on unsupported testbed." conditions: - - "('t2' not in topo_name) or (asic_subtype not in ['broadcom-dnx']) or ('arista_7800' not in platform)" + - "('t2' not in topo_name) or (asic_subtype not in ['broadcom-dnx']) or ('arista_7800' not in platform) or (asic_type in ['cisco-8000'])" voq/test_fabric_reach.py: skip: reason: "Skip test_fabric_reach on unsupported testbed." conditions: - - "('t2' not in topo_name) or (asic_subtype not in ['broadcom-dnx']) or ('arista_7800' not in platform)" + - "('t2' not in topo_name) or (asic_subtype not in ['broadcom-dnx']) or ('arista_7800' not in platform) or (asic_type in ['cisco-8000'])" voq/test_voq_fabric_isolation.py: skip: reason: "Skip test_voq_fabric_isolation on unsupported testbed." conditions: - - "('t2' not in topo_name) or (asic_subtype not in ['broadcom-dnx'])" + - "('t2' not in topo_name) or (asic_subtype not in ['broadcom-dnx']) or (asic_type in ['cisco-8000'])" voq/test_voq_fabric_status_all.py: skip: reason: "Skip test_voq_fabric_status_all on unsupported testbed." conditions: - - "('t2' not in topo_name) or (asic_subtype not in ['broadcom-dnx']) or ('arista_7800' not in platform)" + - "('t2' not in topo_name) or (asic_subtype not in ['broadcom-dnx']) or ('arista_7800' not in platform) or (asic_type in ['cisco-8000'])" ####################################### ##### vrf ##### @@ -1795,7 +1931,7 @@ vxlan/test_vxlan_bfd_tsa.py::Test_VxLAN_BFD_TSA::test_tsa_case4: reason: "VxLAN ECMP BFD TSA test is not yet supported on multi-ASIC platform. Also this test can only run on 4600c, 2700 and 8102. For KVM platform, this test is not supported due to system check not supported currently." conditions_logical_operator: OR conditions: - - "(is_multi_asic == True) or (platform not in ['x86_64-8102_64h_o-r0', 'x86_64-8101_32fh_o-r0', 'x86_64-mlnx_msn4600c-r0', 'x86_64-mlnx_msn2700-r0', 'x86_64-mlnx_msn2700a1-r0', 'x86_64-kvm_x86_64-r0'])" + - "(is_multi_asic == True) or (platform not in ['x86_64-8102_64h_o-r0', 'x86_64-8101_32fh_o-r0', 'x86_64-mlnx_msn4600c-r0', 'x86_64-mlnx_msn2700-r0', 'x86_64-mlnx_msn2700a1-r0', 'x86_64-kvm_x86_64-r0', 'x86_64-mlnx_msn4700-r0', 'x86_64-nvidia_sn4280-r0'])" - "(asic_type in ['vs']) and https://github.com/sonic-net/sonic-buildimage/issues/19879" vxlan/test_vxlan_bfd_tsa.py::Test_VxLAN_BFD_TSA::test_tsa_case5: @@ -1803,7 +1939,7 @@ vxlan/test_vxlan_bfd_tsa.py::Test_VxLAN_BFD_TSA::test_tsa_case5: reason: "VxLAN ECMP BFD TSA test is not yet supported on multi-ASIC platform. Also this test can only run on 4600c, 2700 and 8102. For KVM platform, this test is not supported due to system check not supported currently." conditions_logical_operator: OR conditions: - - "(is_multi_asic == True) or (platform not in ['x86_64-8102_64h_o-r0', 'x86_64-8101_32fh_o-r0', 'x86_64-mlnx_msn4600c-r0', 'x86_64-mlnx_msn2700-r0', 'x86_64-mlnx_msn2700a1-r0', 'x86_64-kvm_x86_64-r0'])" + - "(is_multi_asic == True) or (platform not in ['x86_64-8102_64h_o-r0', 'x86_64-8101_32fh_o-r0', 'x86_64-mlnx_msn4600c-r0', 'x86_64-mlnx_msn2700-r0', 'x86_64-mlnx_msn2700a1-r0', 'x86_64-kvm_x86_64-r0', 'x86_64-mlnx_msn4700-r0', 'x86_64-nvidia_sn4280-r0'])" - "(asic_type in ['vs']) and https://github.com/sonic-net/sonic-buildimage/issues/19879" vxlan/test_vxlan_bfd_tsa.py::Test_VxLAN_BFD_TSA::test_tsa_case6: @@ -1811,7 +1947,7 @@ vxlan/test_vxlan_bfd_tsa.py::Test_VxLAN_BFD_TSA::test_tsa_case6: reason: "VxLAN ECMP BFD TSA test is not yet supported on multi-ASIC platform. Also this test can only run on 4600c, 2700 and 8102. For KVM platform, this test is not supported due to system check not supported currently." conditions_logical_operator: OR conditions: - - "(is_multi_asic == True) or (platform not in ['x86_64-8102_64h_o-r0', 'x86_64-8101_32fh_o-r0', 'x86_64-mlnx_msn4600c-r0', 'x86_64-mlnx_msn2700-r0', 'x86_64-mlnx_msn2700a1-r0', 'x86_64-kvm_x86_64-r0'])" + - "(is_multi_asic == True) or (platform not in ['x86_64-8102_64h_o-r0', 'x86_64-8101_32fh_o-r0', 'x86_64-mlnx_msn4600c-r0', 'x86_64-mlnx_msn2700-r0', 'x86_64-mlnx_msn2700a1-r0', 'x86_64-kvm_x86_64-r0', 'x86_64-mlnx_msn4700-r0', 'x86_64-nvidia_sn4280-r0'])" - "(asic_type in ['vs']) and https://github.com/sonic-net/sonic-buildimage/issues/19879" vxlan/test_vxlan_crm.py: diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions_platform_tests.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions_platform_tests.yaml index ea366c11a4..1d9c2b5f94 100644 --- a/tests/common/plugins/conditional_mark/tests_mark_conditions_platform_tests.yaml +++ b/tests/common/plugins/conditional_mark/tests_mark_conditions_platform_tests.yaml @@ -309,9 +309,12 @@ platform_tests/api/test_module.py::TestModuleApi::test_get_system_eeprom_info: platform_tests/api/test_module.py::TestModuleApi::test_reboot: skip: - reason: "Reboot commands currently not supported from inside pmon container for Cisco 8000 platform" + reason: "Reboot commands currently not supported from inside pmon container for Cisco 8000 platform + / Only support T2" + conditions_logical_operator: or conditions: - "asic_type in ['cisco-8000']" + - "topo_type not in ['t2']" ####################################### ##### api/test_psu.py ##### @@ -679,6 +682,7 @@ platform_tests/broadcom/test_ser.py: - "asic_type not in ['broadcom']" - "platform in ['x86_64-arista_720dt_48s'] and https://github.com/sonic-net/sonic-mgmt/issues/7297" - "asic_subtype in ['broadcom-dnx'] and https://github.com/sonic-net/sonic-mgmt/issues/7546" + - "'marvell' in asic_type" ####################################### ##### cli/test_show_platform.py ##### @@ -778,9 +782,12 @@ platform_tests/mellanox/test_check_sfp_using_ethtool.py: platform_tests/mellanox/test_reboot_cause.py: skip: - reason: "Does not support platform_tests/mellanox/test_reboot_cause.py. sn4280 driver doesn't support reset_from_asic and reset_reload_bios" + reason: "Does not support platform_tests/mellanox/test_reboot_cause.py. sn4280 driver doesn't support reset_from_asic and reset_reload_bios + / Mellanox platform tests only supported on Mellanox devices" + conditions_logical_operator: or conditions: - "platform in ['x86_64-mlnx_msn2010-r0', 'x86_64-mlnx_msn2700-r0', 'x86_64-mlnx_msn2100-r0', 'x86_64-mlnx_msn2410-r0', 'x86_64-nvidia_sn2201-r0', 'x86_64-nvidia_sn4280-r0']" + - "asic_type not in ['mellanox', 'nvidia-bluefield']" ####################################### ##### sfp ##### @@ -814,9 +821,12 @@ platform_tests/test_advanced_reboot.py: platform_tests/test_advanced_reboot.py::test_fast_reboot_from_other_vendor: skip: - reason: "skip test_fast_reboot_from_other_vendor due to knonw issue, if xfail it, it will block other test cases" + reason: "skip test_fast_reboot_from_other_vendor due to knonw issue, if xfail it, it will block other test cases / Unsupported platform" + conditions_logical_operator: or conditions: - - https://github.com/sonic-net/sonic-mgmt/issues/11007 + - "https://github.com/sonic-net/sonic-mgmt/issues/11007" + - "platform in ['x86_64-arista_7050_qx32s']" + - "'dualtor' in topo_name and release in ['202012']" ####################################### ##### test_cont_warm_reboot.py ##### From 2e85ac406d7d2d20520fdd7c3294cd1474d5af76 Mon Sep 17 00:00:00 2001 From: Yutong Zhang Date: Thu, 10 Oct 2024 10:16:47 +0800 Subject: [PATCH 2/2] bugfix --- .../conditional_mark/tests_mark_conditions.yaml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml index 9711ff7268..8d079a5a89 100644 --- a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml +++ b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml @@ -80,8 +80,7 @@ bfd/test_bfd.py::test_bfd_basic: and not supported for platforms other than Nvidia 4600c/4700/5600. Skipping the test" conditions_logical_operator: or conditions: - - "platform in ['x86_64-8102_64h_o-r0', 'x86_64-8101_32fh_o-r0', 'x86_64-8111_32eh_o-r0', 'x86_64-8122_64eh_o-r0', - 'x86_64-8122_64ehf_o-r0', 'x86_64-mlnx_msn4600c-r0', 'x86_64-mlnx_msn4700-r0', 'x86_64-nvidia_sn5600-r0']" + - "platform in ['x86_64-8102_64h_o-r0', 'x86_64-8101_32fh_o-r0', 'x86_64-8111_32eh_o-r0', 'x86_64-8122_64eh_o-r0', 'x86_64-8122_64ehf_o-r0', 'x86_64-mlnx_msn4600c-r0', 'x86_64-mlnx_msn4700-r0', 'x86_64-nvidia_sn5600-r0']" - "release in ['201811', '201911']" bfd/test_bfd.py::test_bfd_scale: @@ -90,8 +89,7 @@ bfd/test_bfd.py::test_bfd_scale: and not supported for platforms other than Nvidia 4600c/4700/5600. Skipping the test" conditions_logical_operator: or conditions: - - "platform in ['x86_64-8102_64h_o-r0', 'x86_64-8101_32fh_o-r0', 'x86_64-8111_32eh_o-r0', 'x86_64-8122_64eh_o-r0', - 'x86_64-8122_64ehf_o-r0', 'x86_64-mlnx_msn4600c-r0', 'x86_64-mlnx_msn4700-r0', 'x86_64-nvidia_sn5600-r0']" + - "platform in ['x86_64-8102_64h_o-r0', 'x86_64-8101_32fh_o-r0', 'x86_64-8111_32eh_o-r0', 'x86_64-8122_64eh_o-r0', 'x86_64-8122_64ehf_o-r0', 'x86_64-mlnx_msn4600c-r0', 'x86_64-mlnx_msn4700-r0', 'x86_64-nvidia_sn5600-r0']" - "release in ['201811', '201911']" bfd/test_bfd_static_route.py: @@ -342,6 +340,7 @@ dhcp_relay/test_dhcp_relay.py::test_dhcp_relay_after_link_flap: dhcp_relay/test_dhcp_relay.py::test_dhcp_relay_random_sport: skip: reason: "Skip test_dhcp_relay_random_sport on dualtor in 201811 and 201911 or platform x86_64-8111_32eh_o-r0" + conditions_logical_operator: or conditions: - "'dualtor' in topo_name and release in ['201811', '201911']" - "platform in ['x86_64-8111_32eh_o-r0']" @@ -496,11 +495,9 @@ dualtor_io: dualtor_io/test_link_failure.py::test_active_link_admin_down_config_reload_link_up_downstream_standby[active-active]: xfail: reason: "Testcase ignored on mellanox setups due to github issue: https://github.com/sonic-net/sonic-buildimage/issues/16161" - conditions_logical_operator: or conditions: - "https://github.com/sonic-net/sonic-buildimage/issues/16161 and asic_type in ['mellanox']" - dualtor_io/test_link_failure.py::test_active_link_down_downstream_active: xfail: reason: "Testcase ignored on Nvidia platforms due to github issue: https://github.com/sonic-net/sonic-mgmt/issues/8272" @@ -834,6 +831,7 @@ generic_config_updater/test_pfcwd_status.py: generic_config_updater/test_pg_headroom_update.py: skip: reason: "Unsupported topology." + conditions_logical_operator: "OR" conditions: - "topo_type in ['m0', 'mx']" - "'t2' in topo_name" @@ -1020,6 +1018,7 @@ ip/test_ip_packet.py::TestIPPacket::test_forward_ip_packet_with_0xffff_chksum_to skip: reason: "Mellanox and Broadcom DNX Asic will drop IP packets with 0xffff checksum / Skipping ip packet test since can't provide enough interfaces" + conditions_logical_operator: or conditions: - "asic_type in ['mellanox'] or asic_subtype in ['broadcom-dnx']" - "len(minigraph_interfaces) < 2 and len(minigraph_portchannels) < 2" @@ -1158,18 +1157,14 @@ pc/test_po_cleanup.py: pc/test_po_update.py::test_po_update: skip: reason: "Skip test due to there is no portchannel or no portchannel member exists in current topology." - conditions_logical_operator: or conditions: - "len(minigraph_portchannels) == 0 or len(minigraph_portchannels[list(minigraph_portchannels.keys())[0]]['members']) == 0" - - "len(minigraph_portchannels) == 0 and not is_multi_asic" pc/test_po_update.py::test_po_update_io_no_loss: skip: reason: "Skip test due to there isn't enough port channel exists in current topology." - conditions_logical_operator: or conditions: - "len(minigraph_portchannel_interfaces) < 2" - - "len(minigraph_portchannels) == 0 and not is_multi_asic" pc/test_po_voq.py: skip: