[DO-NOT-MERGE][test] VPP: use #1907 with VPP 0.5 - #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
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
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
8263e4b to
5b1df9c
Compare
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
5b1df9c to
feb7e3e
Compare
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
Point src/sonic-sairedis at PR sonic-net#1907 and platform/vpp at a branch based on current upstream master with VPP_VERSION bumped to 2606-0.5. The new package key forces buildimage to compile the current sonic_ext sources instead of downloading stale 2606-0.4 debs that predate the glean redirect and plugin API changes. Keep both submodule URLs on the lunyue-ms forks for this Elastictest-only image build. This commit must not be merged. 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>
feb7e3e to
a8f9570
Compare
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
Why I did it
Test-only combination branch for building a full VPP image with:
src/sonic-sairedis->537765268cc827497d7a6bdd2dec5c5253679104([vslib/vpp] Fix sub-port and LAG sub-port datapath on SONiC-VPP platform sonic-sairedis#1907)platform/vpp->100d39afbeb56ffb9ec872481ddca0888df07034(
lunyue-ms/test/vpp-0.5-subport-pr27630, based on current upstream master)The platform branch only bumps
VPP_VERSIONfrom2606-0.4to2606-0.5.The published
0.4packages predate the merged glean redirect and sonic_extAPI changes, so normal buildimage builds silently download stale VPP debs.
0.5is not present in Buildkite and therefore forces the existingbuild_locallyfallback to compile the current platform/vpp sources.Both submodule URLs temporarily point to the
lunyue-msforks. This PR mustnot be merged.
How I did it
with the independently advanced upstream sairedis pointer.
test/vpp-0.5-subport-pr27630from current sonic-platform-vpp masterand changed only the VPP package cache suffix and its explanatory comment.
Verification
2606-0.5+b1sonic1.2606-0.5+b1sonic1VPP deb set from source.vpp-plugin-core_2606-0.5+b1sonic1_amd64.debcontains:sonic-ext-capturesonic-ext-aggr-tap-redirectsonic-ext-glean-redirectsonic-ext-ip2me-ip4sonic-ext-ip2me-ip6vpp-dev_2606-0.5+b1sonic1_amd64.debcontains the generatedsonic_ext.api_enum.handsonic_ext.api_types.hheaders.Azure CI will build the full image for Elastictest validation.
Cleanup
After sonic-sairedis#1907 is merged and the VPP package cache is updated,
restore both
.gitmodulesURLs tosonic-netand update the gitlinks toupstream commits.