Skip to content

Commit 2ed6142

Browse files
authored
Merge pull request #242 from yejianquan/bump-vpp-version-04-cache-bust
PR #234 added vppbld/patches/0011-sonic-inner-aware-flow-hash.patch (introducing BOND_API_LB_ALGO_L34_INNER = 6 and the inner-aware ECMP/LAG hash) but did not bump VPP_VERSION. The vppbld/Makefile keys its cache lookup on VPP_VERSION_SONIC, so downstream sonic-buildimage builds keep pulling the 2026-04-15 0.3+b1sonic1 debs from buildkite -- which were built before patch 0011 existed. As soon as the matching sairedis (PR #1896) lands and starts sending lb=6 to bond_create, the stale VPP rejects the algo, no BondEthernets are created, and all LAG-side BGP sessions stay in Active/Connect (failure visible in sonic-buildimage PR #27621 CI). Bump the minor suffix to 0.4 to invalidate the cache; downstream builds will fall back to build_locally until buildkite is repopulated for 0.4. Add an inline comment documenting the cache-key convention so the next patch contributor does not repeat the miss. vppbld: bump VPP_VERSION 0.3 -> 0.4 to invalidate stale buildkite cache signed-off-by: jianquanye@microsoft.com
2 parents 756648b + b89abdc commit 2ed6142

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

rules/vpp.mk

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
# libvpp package
22

33
VPP_VERSION_BASE = 2510
4-
VPP_VERSION = $(VPP_VERSION_BASE)-0.3
4+
# Bump the minor suffix whenever vppbld/patches/series or any patch file
5+
# under vppbld/patches/*.patch changes content. The VPP_VERSION_SONIC string
6+
# is the cache key used by vppbld/Makefile to fetch pre-built debs from
7+
# https://packages.buildkite.com/sonic-vpp/vpp; if the suffix isn't bumped,
8+
# downstream sonic-buildimage builds will silently pull stale debs that
9+
# pre-date the new patch series and end up with VPP/SAI CRC drift.
10+
VPP_VERSION = $(VPP_VERSION_BASE)-0.4
511
VPP_VERSION_SONIC = $(VPP_VERSION)+b1sonic1
612
VPP_SRC_PATH = platform/vpp/vppbld
713

0 commit comments

Comments
 (0)