[test-only][DO NOT MERGE] Pin sonic-sairedis to the MPLS VPP branch to build a test image - #28806
[test-only][DO NOT MERGE] Pin sonic-sairedis to the MPLS VPP branch to build a test image#28806augusdn wants to merge 1 commit into
Conversation
Builds a sonic-vpp image containing the VPP SAI MPLS backend from sonic-net/sonic-sairedis#2008 (commit 16005ff1e), so that the tests enabled by sonic-net/sonic-mgmt#26619 can be validated end to end before either PR merges. This PR is throwaway and must never be merged.
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
There was a problem hiding this comment.
🟡 Not ready to approve
The submodule is repointed to a personal fork/branch, which is not acceptable for a mergeable change due to supply-chain and long-term reproducibility risk.
Once you've addressed the issues Copilot identified, you can request another Copilot review.
This review doesn't count toward merge requirements. Sign up for the private preview to control whether Copilot approvals count.
Pull request overview
Pins the sonic-sairedis git submodule configuration to a non-upstream repository/branch to enable CI to build a sonic-vs/VPP test image that includes the MPLS-capable VPP SAI backend for end-to-end validation with sonic-mgmt MPLS tests.
Changes:
- Repoints the
src/sonic-sairedissubmodule URL fromsonic-net/sonic-sairedistoaugusdn/sonic-sairedis. - Adds a
branch = augusdn/vpp-mpls-inseg-25782tracking hint for that submodule.
File summaries
| File | Description |
|---|---|
.gitmodules |
Repoints the sonic-sairedis submodule source (and adds a branch hint) to build a test image from an unmerged backend branch. |
Review details
- Files reviewed: 2/2 changed files
- Comments generated: 1
- Review effort level: Lite
We're testing this review assessment. Please use 👍 or 👎 to tell us if it's correct.
| url = https://github.com/augusdn/sonic-sairedis | ||
| branch = augusdn/vpp-mpls-inseg-25782 |
Description of PR
This is a throwaway test-only PR. It must never be merged, and I will close it once the image has been built.
It pins
src/sonic-sairedisto the branch behind sonic-net/sonic-sairedis#2008 (commit16005ff) so the pipeline produces a realsonic-vs/vpp image containing the VPP SAI MPLS backend.That image is needed to validate sonic-net/sonic-mgmt#26619 end to end before either PR merges. Without it the newly enabled
tests/mplscases have no backend to talk to, sokvmtest-t1-lag-vppon that PR cannot pass no matter how correct the test code is.Thanks to @lolyu for suggesting this approach (same mechanism as #27555).
Type of change
Approach
What is the motivation for this PR?
sonic-buildimage#25782 asks for MPLS data-plane support on sonic-vpp. The work is split across two PRs:
tests/mplson thet1-lag-vpptestbedThey are mutually dependent for validation: the tests need the backend in the image, and the backend has no automated coverage without the tests. This PR breaks that cycle by building an image from the unmerged backend.
How did you do it?
Two changes only:
.gitmodules— point thesonic-sairedissubmodule ataugusdn/sonic-sairedis, branchaugusdn/vpp-mpls-inseg-25782src/sonic-sairedis— bump the submodule pointer to16005ff1e744c4aa85964be6d3702e2635341d58How did you verify/test it?
The backend has already been validated on a local KVM testbed with the library installed into
syncd:and the full surrounding framework run on the same testbed was
17 passed, 5 skipped, 0 failed. sonic-sairedis#2008's own CI is green across all nine build jobs plus ASAN, CodeQL and Semgrep.This PR exists purely to produce the image artifact so the same result can be reproduced on Elastictest against a properly built image rather than a hot-swapped library.
Documentation
No documentation change — test-only, not for merge.