From 106475bf1bd62e9a0f924fc98ec283d6bec2d082 Mon Sep 17 00:00:00 2001 From: Deepak Singhal Date: Tue, 14 Jul 2026 22:13:42 +0000 Subject: [PATCH] [bgp]: Skip test_bgp_suppress_fib for suppress-fib dynamic-toggle race (#26175) The module toggles suppress-fib-pending dynamically at runtime, triggering an orchagent/fpmsyncd/FRR race where routes are intermittently not marked offloaded in FRR / not propagated to the upstream VM, failing essentially every case. The product fix makes suppress-fib static (sonic-swss#4333 + sonic-mgmt#22916) and is merging to master only; it is not backported. The skip therefore distinguishes lift semantics per branch: - master: auto-lifts once the fix lands and #26175 is closed (issue-gated). - 202505/202511/202605: fix never backported -> permanent skip for the branch. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8fc0c0b6-c1f5-43a8-b645-c1d2ebb82361 Signed-off-by: Deepak Singhal --- .../conditional_mark/tests_mark_conditions.yaml | 13 ++++++++++++- 1 file changed, 12 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 dc330c73392..57c71df8128 100644 --- a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml +++ b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml @@ -627,9 +627,20 @@ bgp/test_bgp_stress_link_flap.py::test_bgp_stress_link_flap[all]: bgp/test_bgp_suppress_fib.py: skip: - reason: "Not supported before release 202411." + reason: "(1) Not supported before release 202411. + (2) suppress-fib dynamic-toggle offload/propagation race: the module toggles + suppress-fib-pending dynamically at runtime, causing an orchagent/fpmsyncd/FRR race + where routes are intermittently not offloaded in FRR / not propagated to the upstream VM. + The product fix that makes suppress-fib static (sonic-swss#4333 + sonic-mgmt#22916) is + merging to master only and is not backported. Therefore master auto-lifts once the fix + lands and the tracking issue is closed, while the release branches 202505/202511/202605 + never receive the fix and stay skipped for the life of the branch. + Tracked by https://github.com/sonic-net/sonic-mgmt/issues/26175" + conditions_logical_operator: or conditions: - "release in ['201811', '201911', '202012', '202205', '202211', '202305', '202311', '202405']" + - "release in ['202505', '202511', '202605']" + - "release in ['master'] and https://github.com/sonic-net/sonic-mgmt/issues/26175" xfail: reason: "xfail for IPv6-only topologies, issue https://github.com/sonic-net/sonic-mgmt/issues/20756 or Mellanox platform due to https://github.com/sonic-net/sonic-buildimage/issues/24679" conditions_logical_operator: or