From feb7e3e92605d36d61872fb2deaf43d7a6ee5a20 Mon Sep 17 00:00:00 2001 From: Lun Yue <17232861+lunyue-ms@users.noreply.github.com> Date: Fri, 31 Jul 2026 11:31:06 +0000 Subject: [PATCH] [DO-NOT-MERGE][test] VPP: use sub-port fix branches Point src/sonic-sairedis at sonic-sairedis#1907 and platform/vpp at sonic-platform-vpp#267 so Azure CI can build a full VPP image with both in-review fixes. Keep only these two submodule URLs on the lunyue-ms forks. The platform-vpp branch is rebased over merged PR #257, drops its duplicate bond/aggregate helpers, and uses VPP package version 2606-0.5. Version 0.4 was already published in the Buildkite package repository without the glean redirect node, causing downstream builds to silently consume a stale plugin. Local docker-syncd-vpp build and deployment on vms-kvm-vpp-t1-lag succeeded. The full sub-port suite completed 29 passed and 3 skipped with all dataplane cases passing; two teardown errors were caused only by existing VPP loganalyzer messages during SVI cleanup. Core dump, config, YANG, and post-test sanity checks passed. Must not be merged: restore both submodule URLs after the dependent PRs land. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 232e6bef-2d69-47ff-9257-8f8ef3113bab Signed-off-by: Lun Yue <17232861+lunyue-ms@users.noreply.github.com> --- .gitmodules | 2 +- platform/vpp | 2 +- src/sonic-sairedis | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7a75dfb0711..af0dc63ff3b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ url = https://github.com/sonic-net/sonic-linux-kernel [submodule "sonic-sairedis"] path = src/sonic-sairedis - url = https://github.com/sonic-net/sonic-sairedis + url = https://github.com/lunyue-ms/sonic-sairedis [submodule "sonic-swss"] path = src/sonic-swss url = https://github.com/sonic-net/sonic-swss diff --git a/platform/vpp b/platform/vpp index a119f8d998d..c8f82003a0a 160000 --- a/platform/vpp +++ b/platform/vpp @@ -1 +1 @@ -Subproject commit a119f8d998dbb3a8780bb40770f5d1700e993242 +Subproject commit c8f82003a0ad835608c14ce249d29ec39578181b diff --git a/src/sonic-sairedis b/src/sonic-sairedis index e3b9218f6ba..537765268cc 160000 --- a/src/sonic-sairedis +++ b/src/sonic-sairedis @@ -1 +1 @@ -Subproject commit e3b9218f6ba29b50b7edf8142388de23c55511bf +Subproject commit 537765268cc827497d7a6bdd2dec5c5253679104