Skip to content

Commit cceb07f

Browse files
[Bugfix] Fix incorrect conditions added in longer entries (sonic-net#14955)
In PR sonic-net#14912, we added conditions to longer matching entries in conditional marks. We got some mistakes while adding conditions into some longer entries. In this PR, we fix these mistakes.
1 parent ffbf8b5 commit cceb07f

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ bfd/test_bfd.py::test_bfd_basic:
8080
and not supported for platforms other than Nvidia 4600c/4700/5600. Skipping the test"
8181
conditions_logical_operator: or
8282
conditions:
83-
- "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']"
83+
- "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']"
84+
- "platform not in ['x86_64-mlnx_msn4600c-r0', 'x86_64-mlnx_msn4700-r0', 'x86_64-nvidia_sn5600-r0', 'x86_64-8102_64h_o-r0', 'x86_64-8101_32fh_o-r0']"
8485
- "release in ['201811', '201911']"
8586

8687
bfd/test_bfd.py::test_bfd_scale:
@@ -89,7 +90,8 @@ bfd/test_bfd.py::test_bfd_scale:
8990
and not supported for platforms other than Nvidia 4600c/4700/5600. Skipping the test"
9091
conditions_logical_operator: or
9192
conditions:
92-
- "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']"
93+
- "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']"
94+
- "platform not in ['x86_64-mlnx_msn4600c-r0', 'x86_64-mlnx_msn4700-r0', 'x86_64-nvidia_sn5600-r0', 'x86_64-8102_64h_o-r0', 'x86_64-8101_32fh_o-r0']"
9395
- "release in ['201811', '201911']"
9496

9597
bfd/test_bfd_static_route.py:

tests/common/plugins/conditional_mark/tests_mark_conditions_platform_tests.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -776,9 +776,11 @@ platform_tests/mellanox:
776776

777777
platform_tests/mellanox/test_check_sfp_using_ethtool.py:
778778
skip:
779-
reason: "Deprecated as Mellanox do not use ethtool in release 202305 or higher"
779+
reason: "Deprecated as Mellanox do not use ethtool in release 202305 or higher / Mellanox platform tests only supported on Mellanox devices"
780+
conditions_logical_operator: or
780781
conditions:
781782
- "asic_type in ['mellanox']"
783+
- "asic_type not in ['mellanox', 'nvidia-bluefield']"
782784

783785
platform_tests/mellanox/test_reboot_cause.py:
784786
skip:

0 commit comments

Comments
 (0)