Skip to content

Commit 28a5007

Browse files
committed
Update skip condition for SRv6 feature on Mellanox platform
1. Limit SRv6 test script on 202412 master 202511 and later release 2. Skip SRv6 on Mellanox SPC1-3 Change-Id: I27519e05d55d93cf5a11ede30861d08048738210 Signed-off-by: echuawu <[email protected]>
1 parent 021b1cf commit 28a5007

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4644,21 +4644,23 @@ srv6/test_srv6_basic_sanity.py::test_traffic_check_normal:
46444644

46454645
srv6/test_srv6_dataplane.py:
46464646
skip:
4647-
reason: "Only target mellanox and brcm platform with 202412 image at this time. Skip for non Arista-7060X6-64PE-B-* TH5 SKUs. Skip for t0-isolated-d96u32, t1-isolated-d32/128. Or test case has issue on the t0-isolated-d256u256s2 topo."
4647+
reason: "Only target mellanox SPC4+ and brcm platform with 202412 or 202511+ image. Skip for non Arista-7060X6-64PE-B-* TH5 SKUs. Skip for t0-isolated-d96u32, t1-isolated-d32/128. Or test case has issue on the t0-isolated-d256u256s2 topo."
46484648
conditions_logical_operator: or
46494649
conditions:
4650-
- "asic_type not in ['mellanox', 'broadcom', 'vpp']"
4650+
- "asic_type not in ['mellanox', 'broadcom', 'vpp'] or (release != 'master' and release != '202412' and release < '202511')"
46514651
- "release not in ['202412'] and asic_type not in ['vpp']"
4652+
- "asic_type == 'mellanox' and asic_gen in ['spc1', 'spc2', 'spc3']"
46524653
- "'Arista-7060X6-64PE' in hwsku and 'Arista-7060X6-64PE-B' not in hwsku"
46534654
- "topo_name in ['t0-isolated-d96u32s2', 't1-isolated-d128', 't1-isolated-d32']"
46544655
- "'t0-isolated-d256u256s2' in topo_name and platform in ['x86_64-nvidia_sn5640-r0']"
46554656

46564657
srv6/test_srv6_static_config.py:
46574658
skip:
4658-
reason: "Requires particular image support, skip in PR testing. Skip for non Arista-7060X6-64PE-B-* TH5 SKUs. Skip for t0-isolated-d96u32, t1-isolated-d32/128"
4659+
reason: "Only target mellanox SPC4+ platform with 202412 or 202511+ image. Requires particular image support (202412 or 202511+). Skip for non Arista-7060X6-64PE-B-* TH5 SKUs. Skip for t0-isolated-d96u32, t1-isolated-d32/128"
46594660
conditions_logical_operator: or
46604661
conditions:
4661-
- "release not in ['202412'] and asic_type not in ['vpp']"
4662+
- "(release != 'master' and release != '202412' and release < '202511') and asic_type not in ['vpp']"
4663+
- "asic_type == 'mellanox' and asic_gen in ['spc1', 'spc2', 'spc3']"
46624664
- "'Arista-7060X6-64PE' in hwsku and 'Arista-7060X6-64PE-B' not in hwsku"
46634665
- "topo_name in ['t0-isolated-d96u32s2', 't1-isolated-d128', 't1-isolated-d32']"
46644666

@@ -4670,10 +4672,11 @@ srv6/test_srv6_static_config.py::test_uDT46_config:
46704672

46714673
srv6/test_srv6_vlan_forwarding.py:
46724674
skip:
4673-
reason: "Only target mellanox/brcm platform with 202412 image at this time. Skip for non Arista-7060X6-64PE-B-* TH5 SKUs. Skip for t0-isolated-d96u32, t1-isolated-d32/128"
4675+
reason: "Only target mellanox SPC4+/brcm platform with 202412 or 202511+ image. Skip for non Arista-7060X6-64PE-B-* TH5 SKUs. Skip for t0-isolated-d96u32, t1-isolated-d32/128"
46744676
conditions_logical_operator: or
46754677
conditions:
4676-
- "asic_type not in ['mellanox', 'broadcom'] or release not in ['202412']"
4678+
- "asic_type not in ['mellanox', 'broadcom'] or (release != 'master' and release != '202412' and release < '202511')"
4679+
- "asic_type == 'mellanox' and asic_gen in ['spc1', 'spc2', 'spc3']"
46774680
- "'Arista-7060X6-64PE' in hwsku and 'Arista-7060X6-64PE-B' not in hwsku"
46784681
- "topo_name in ['t0-isolated-d96u32s2', 't1-isolated-d128', 't1-isolated-d32']"
46794682

0 commit comments

Comments
 (0)