From 438269578a2699be0f279694f6a1dcd7a2d4669b Mon Sep 17 00:00:00 2001 From: xuliping Date: Sun, 8 Dec 2024 16:22:22 +0000 Subject: [PATCH 1/2] xfail pfcwd warm reboot for broadcom --- .../plugins/conditional_mark/tests_mark_conditions.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml index eea961a4285..ae966fd8b50 100644 --- a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml +++ b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml @@ -1374,9 +1374,10 @@ pfcwd/test_pfcwd_warm_reboot.py: - "topo_type in ['m0', 'mx']" xfail: reason: "Warm Reboot is not supported in dualtor and has a known issue on 202305 branch" + conditions_logical_operator: or conditions: - - "'dualtor' in topo_name" - - https://github.com/sonic-net/sonic-mgmt/issues/8400 + - "https://github.com/sonic-net/sonic-mgmt/issues/8400 and 'dualtor' in topo_name" + - "https://github.com/sonic-net/sonic-mgmt/issues/15942 and asic_type in ['broadcom']" ####################################### ##### process_monitoring ##### From b9d068042b4a442ad5717f18b3a5c27e3d6b4b98 Mon Sep 17 00:00:00 2001 From: xulping Date: Thu, 9 Jan 2025 08:44:10 +0000 Subject: [PATCH 2/2] xfail mellanox --- .../common/plugins/conditional_mark/tests_mark_conditions.yaml | 2 +- 1 file changed, 1 insertion(+), 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 ae966fd8b50..b9713a4da8d 100644 --- a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml +++ b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml @@ -1377,7 +1377,7 @@ pfcwd/test_pfcwd_warm_reboot.py: conditions_logical_operator: or conditions: - "https://github.com/sonic-net/sonic-mgmt/issues/8400 and 'dualtor' in topo_name" - - "https://github.com/sonic-net/sonic-mgmt/issues/15942 and asic_type in ['broadcom']" + - "https://github.com/sonic-net/sonic-mgmt/issues/15942 and asic_type in ['broadcom', 'mellanox']" ####################################### ##### process_monitoring #####