From eb0a29a729200602ea5774fc899c79d23a4656d8 Mon Sep 17 00:00:00 2001 From: Xichen96 Date: Mon, 20 Jul 2026 06:17:01 +0000 Subject: [PATCH 1/2] [route]: Skip warm reboot tests on 720dt Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: b8fb8259-87f3-4de3-b1a4-59fe52e8be86 Signed-off-by: Xichen96 --- .../conditional_mark/tests_mark_conditions.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml index 6e2942d2d7c..347f5e1b682 100644 --- a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml +++ b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml @@ -4992,9 +4992,11 @@ route/test_static_route.py::test_static_route_ecmp_ipv6: route/test_static_route.py::test_static_route_ecmp_warmboot: skip: - reason: "Warm reboot is not supported on dualtor topology" + reason: "Warm reboot is not supported on dualtor topology or Arista-720DT" + conditions_logical_operator: OR conditions: - "topo_name in ['dualtor', 'dualtor-56', 'dualtor-120', 'dualtor-aa', 'dualtor-aa-56', 'dualtor-aa-64-breakout']" + - "'Arista-720DT' in hwsku" route/test_static_route.py::test_static_route_ipv6: xfail: @@ -5004,15 +5006,19 @@ route/test_static_route.py::test_static_route_ipv6: route/test_static_route.py::test_static_route_ipv6_warmboot: skip: - reason: "Warm reboot is not supported on dualtor topology" + reason: "Warm reboot is not supported on dualtor topology or Arista-720DT" + conditions_logical_operator: OR conditions: - "topo_name in ['dualtor', 'dualtor-56', 'dualtor-120', 'dualtor-aa', 'dualtor-aa-56', 'dualtor-aa-64-breakout']" + - "'Arista-720DT' in hwsku" route/test_static_route.py::test_static_route_warmboot: skip: - reason: "Warm reboot is not supported on dualtor topology" + reason: "Warm reboot is not supported on dualtor topology or Arista-720DT" + conditions_logical_operator: OR conditions: - "topo_name in ['dualtor', 'dualtor-56', 'dualtor-120', 'dualtor-aa', 'dualtor-aa-56', 'dualtor-aa-64-breakout']" + - "'Arista-720DT' in hwsku" ####################################### ##### sai_qualify ##### From 669f24ccf4fa305a1052c2ada0fc63187a21a3e2 Mon Sep 17 00:00:00 2001 From: Xichen96 Date: Tue, 21 Jul 2026 20:22:20 +1000 Subject: [PATCH 2/2] [route]: Skip warm reboot tests on m0/m1/mx Broaden the three static-route warm-reboot conditional skips from Arista-720DT to every m0, m1, and mx topology while retaining the existing dualtor exclusions. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: b8fb8259-87f3-4de3-b1a4-59fe52e8be86 Signed-off-by: Xichen96 --- .../conditional_mark/tests_mark_conditions.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml index 347f5e1b682..ff4a989098e 100644 --- a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml +++ b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml @@ -4992,11 +4992,11 @@ route/test_static_route.py::test_static_route_ecmp_ipv6: route/test_static_route.py::test_static_route_ecmp_warmboot: skip: - reason: "Warm reboot is not supported on dualtor topology or Arista-720DT" + reason: "Warm reboot is not supported on dualtor, m0, m1, or mx topologies" conditions_logical_operator: OR conditions: - "topo_name in ['dualtor', 'dualtor-56', 'dualtor-120', 'dualtor-aa', 'dualtor-aa-56', 'dualtor-aa-64-breakout']" - - "'Arista-720DT' in hwsku" + - "topo_type in ['m0', 'm1', 'mx']" route/test_static_route.py::test_static_route_ipv6: xfail: @@ -5006,19 +5006,19 @@ route/test_static_route.py::test_static_route_ipv6: route/test_static_route.py::test_static_route_ipv6_warmboot: skip: - reason: "Warm reboot is not supported on dualtor topology or Arista-720DT" + reason: "Warm reboot is not supported on dualtor, m0, m1, or mx topologies" conditions_logical_operator: OR conditions: - "topo_name in ['dualtor', 'dualtor-56', 'dualtor-120', 'dualtor-aa', 'dualtor-aa-56', 'dualtor-aa-64-breakout']" - - "'Arista-720DT' in hwsku" + - "topo_type in ['m0', 'm1', 'mx']" route/test_static_route.py::test_static_route_warmboot: skip: - reason: "Warm reboot is not supported on dualtor topology or Arista-720DT" + reason: "Warm reboot is not supported on dualtor, m0, m1, or mx topologies" conditions_logical_operator: OR conditions: - "topo_name in ['dualtor', 'dualtor-56', 'dualtor-120', 'dualtor-aa', 'dualtor-aa-56', 'dualtor-aa-64-breakout']" - - "'Arista-720DT' in hwsku" + - "topo_type in ['m0', 'm1', 'mx']" ####################################### ##### sai_qualify #####