Commit afbc4ae011 for frr
commit afbc4ae01144021b1f25abe87f85350fe00213f9
Author: Chirag Shah <chirag@nvidia.com>
Date: Mon Nov 16 09:29:22 2026 -0800
tests: [EVPN] skip MAC move tests on Pop!_OS 7.2.15 generic kernel
Pop!_OS kernel 7.2.15-76070215-generic is built from stable 7.2.15,
which carries 3fa64d86fc64 (stable copy of 98fc57d16744) and so rejects
the dynamic VXLAN FDB entry with a nexthop id that FRR installs for
EVPN-MH remote MACs. The upstream correction 7308ef8b4a67 was applied
on 2 Nov 2026, after 7.2.15 was tagged, and 7.2.15 is EOL, so no 7.2.15
ABI contains it.
Add a 7.2.15 generic window to _VXLAN_NH_FDB_FIX with broken ABI 1 and
fixed ABI None, so every 7.2.15 generic ABI, including the Pop!_OS
76070215 build, skips test_evpn_mac_move_to_es_nhg_inactive and
test_evpn_mac_move_to_es_nhg_active.
This is building on top of FRR commit cf723b948b
tests: [EVPN] skip MAC move tests on kernels rejecting nhid dynamic FDB
Signed-off-by: Chirag Shah <chirag@nvidia.com>
diff --git a/tests/topotests/bgp_evpn_mh_v4_v6_num/test_evpn_mh_v4_v6_num.py b/tests/topotests/bgp_evpn_mh_v4_v6_num/test_evpn_mh_v4_v6_num.py
index 4661cbc5ec..1e3f39658b 100644
--- a/tests/topotests/bgp_evpn_mh_v4_v6_num/test_evpn_mh_v4_v6_num.py
+++ b/tests/topotests/bgp_evpn_mh_v4_v6_num/test_evpn_mh_v4_v6_num.py
@@ -1563,7 +1563,10 @@ _VXLAN_NH_FDB_FIX = {
"7.0.0": {
"azure": (1019, None),
"generic": (41, None),
- }
+ },
+ "7.2.15": {
+ "generic": (1, None),
+ },
}
MOVE_DEBUGS = [
"debug zebra kernel",