[DO-NOT-MERGE][test] VPP: use #1907 and #267 - #27630
Conversation
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
1adec44 to
a4acce8
Compare
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
a4acce8 to
f3f8e35
Compare
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
743b57d to
e8e6b53
Compare
|
/azp run Azure.sonic-buildimage |
1 similar comment
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
1 similar comment
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
33f563e to
b0d778f
Compare
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
There was a problem hiding this comment.
Pull request overview
This PR is a test-only (DO-NOT-MERGE) sonic-buildimage change that repoints submodule remotes so the build can fetch fork-only commits for Elastictest regression coverage (VPP promisc/sub-port related fixes).
Changes:
- Repoint
src/sonic-sairedissubmodule URL fromsonic-nettolunyue-msfork. - Repoint
platform/vppsubmodule URL fromsonic-nettolunyue-msfork.
Comments suppressed due to low confidence (1)
.gitmodules:131
- Pointing the submodule URL at a personal fork can break consumers that don’t have access to that fork and reduces build reproducibility if the fork is force-pushed or deleted. For a mergeable change, keep
.gitmodulespointing at the canonical upstream and override the submodule URL only in the test pipeline when needed.
url = https://github.com/lunyue-ms/sonic-platform-vpp.git
| [submodule "sonic-sairedis"] | ||
| path = src/sonic-sairedis | ||
| url = https://github.com/sonic-net/sonic-sairedis | ||
| url = https://github.com/lunyue-ms/sonic-sairedis |
76e62ea to
465ea82
Compare
465ea82 to
2d5c4bc
Compare
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 3 out of 3 changed files in this pull request and generated no new comments.
Comments suppressed due to low confidence (2)
.gitmodules:9
- This changes the sonic-sairedis submodule URL to a personal fork. Committing fork URLs into .gitmodules makes the build non-reproducible for other developers/CI and introduces supply-chain risk. Keep the canonical upstream URL here and override the submodule URL only in the test pipeline/workspace if you need to fetch fork-only commits.
[submodule "sonic-sairedis"]
path = src/sonic-sairedis
url = https://github.com/lunyue-ms/sonic-sairedis
.gitmodules:131
- This changes the platform/vpp submodule URL to a personal fork. Fork URLs in .gitmodules can break downstream clones and create a supply-chain/trust issue; prefer keeping the upstream sonic-net URL and applying any fork override in the CI job (e.g., via git config submodule.platform/vpp.url) for this test-only run.
[submodule "platform/vpp"]
path = platform/vpp
url = https://github.com/lunyue-ms/sonic-platform-vpp.git
|
/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). |
2d5c4bc to
e8c72f2
Compare
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 3 out of 3 changed files in this pull request and generated no new comments.
Suppressed comments (2)
.gitmodules:131
- This commits a submodule URL pointing to a personal fork. That creates a supply-chain/trust risk and can break builds later if the fork/branch becomes unavailable. For integration testing, keep upstream URL in-tree and override the submodule remote in CI/local workflows instead (or revert this before merging).
url = https://github.com/lunyue-ms/sonic-platform-vpp.git
.gitmodules:9
- This commits a submodule URL pointing to a personal fork. That creates a supply-chain/trust risk and can break builds later if the fork/branch becomes unavailable. For integration testing, keep upstream URL in-tree and override the submodule remote in CI/local workflows instead (or revert this before merging).
This issue also appears on line 131 of the same file.
url = https://github.com/lunyue-ms/sonic-sairedis
e8c72f2 to
2a3e8e3
Compare
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 3 out of 3 changed files in this pull request and generated no new comments.
Suppressed comments (2)
.gitmodules:9
- Changing the submodule URL to a personal fork makes the build non-reproducible for other developers/CI and increases supply-chain risk. Keep the canonical sonic-net URL in .gitmodules and, if you need fork-only commits for a temporary test branch, override the submodule URL in CI/local git config (e.g.,
git config submodule.<name>.url ...) instead of committing it.
url = https://github.com/lunyue-ms/sonic-sairedis
.gitmodules:131
- Changing the platform/vpp submodule URL to a personal fork should not be committed: it breaks consumers that expect the canonical upstream remote and weakens provenance. Keep the sonic-net URL in .gitmodules and use a CI/local override for temporary fork testing.
url = https://github.com/lunyue-ms/sonic-platform-vpp.git
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 sonic-net#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>
2a3e8e3 to
8263e4b
Compare
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 3 out of 3 changed files in this pull request and generated no new comments.
Suppressed comments (2)
.gitmodules:9
- Pointing the sonic-sairedis submodule at a personal fork makes the build dependent on a non-canonical remote and increases supply-chain/availability risk if this is ever merged (fork could be deleted or rewritten). Keep .gitmodules URLs pointing at the official upstream and rely on the submodule commit SHA (or CI-only override) for testing fork-only commits.
[submodule "sonic-sairedis"]
path = src/sonic-sairedis
url = https://github.com/lunyue-ms/sonic-sairedis
.gitmodules:131
- Pointing the platform/vpp submodule at a personal fork makes the build dependent on a non-canonical remote and increases supply-chain/availability risk if this is ever merged (fork could be deleted or rewritten). Keep .gitmodules URLs pointing at the official upstream and rely on the submodule commit SHA (or CI-only override) for testing fork-only commits.
[submodule "platform/vpp"]
path = platform/vpp
url = https://github.com/lunyue-ms/sonic-platform-vpp.git
Why I did it
Test-only combination branch for building a full VPP image with two dependent in-review fixes:
src/sonic-sairedis->537765268cc827497d7a6bdd2dec5c5253679104([vslib/vpp] Fix sub-port and LAG sub-port datapath on SONiC-VPP platform sonic-sairedis#1907)platform/vpp->9d27570922412dc45475654b0c5350e56eed6c1f([sonic_ext] Add glean-redirect node: punt unresolved-nexthop transit to the kernel sonic-platform-vpp#267)The
.gitmodulesURLs for only these submodules temporarily point to thelunyue-msforks so Azure CI can fetch them. This PR must not be merged.How I did it
2606-0.5; published2606-0.4packages were stale and lacked the glean node.Verification
target/docker-syncd-vpp.gzsuccessfully from local VPP2606-0.5sources.vlab-vpp-01and verified the running syncd image matched the new tag.sonic-ext-glean-redirectnode andglean redirectcounter.test_sub_port_interfaces.py: 29 passed, 3 skipped. Two teardown errors came only from existing VPP loganalyzer messages during SVI cleanup; all dataplane and post-test health checks passed.Cleanup
After both dependent PRs merge, restore the two
.gitmodulesURLs tosonic-netand update the gitlinks to their merged commits.