From 17e14cd0e0720f234fcb485563934e8c93947b7a Mon Sep 17 00:00:00 2001 From: Storm Liang Date: Wed, 25 Mar 2026 00:12:58 +1100 Subject: [PATCH] fix: add ASIC-based skip condition for generic_config_updater/test_srv6 SRv6 config updater tests fail on platforms that do not support SRv6. The test configures SRV6_MY_LOCATORS and SRV6_MY_SIDS in CONFIG_DB, which causes SAI errors on unsupported ASICs. The loganalyzer in teardown catches these errors and fails the test. Affected ASICs: Broadcom TH/TH2/TD3, Mellanox SPC1/SPC2/SPC3. SRv6-capable ASICs: Broadcom TH5+, Mellanox SPC4+, Cisco Q200/Q201L. Kusto data from 202511 .17 image shows 122/137 failures, all on non-SRv6 ASICs. The existing skip condition only covers topology (t0-isolated-d96u32s2) but not ASIC type. This change adds ASIC-based skip conditions matching the pattern used in srv6/test_srv6_dataplane.py (PR #21713). Signed-off-by: Storm Liang --- .../plugins/conditional_mark/tests_mark_conditions.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml index 8490190f141..c6f20025a82 100644 --- a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml +++ b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml @@ -2653,10 +2653,13 @@ generic_config_updater/test_pg_headroom_update.py: generic_config_updater/test_srv6: skip: - reason: "Unsupported topology." + reason: "SRv6 is not supported on older ASICs (TH/TH2/TD3, SPC1-3). Skip for unsupported topologies and platforms." conditions_logical_operator: "OR" conditions: - "topo_name in ['t0-isolated-d96u32s2']" + - "asic_type not in ['mellanox', 'broadcom', 'cisco', 'cisco-8000', 'vs'] or (release != 'master' and release < '202511')" + - "asic_type == 'mellanox' and asic_gen in ['spc1', 'spc2', 'spc3']" + - "asic_type == 'broadcom' and asic_gen not in ['th5']" generic_config_updater/test_vlan_interface.py::test_vlan_interface_tc1_suite: xfail: