[202605] Backport VPP artifact rename (#4639) + revert libnexthopgroup (#4657) to fix branch CI - #4670
Closed
yxieca wants to merge 2 commits into
Closed
Conversation
* Download VPP artifact 'vpp-<debian version>' What I did In the pipeline definitions, parametrize the VPP artifact name. In azure-pipelines.yml set the artifact name based on the target Debian version. Why I did it VPP artifact names changed as a result of adding the Trixie build: sonic-net/sonic-platform-vpp#248 (cherry picked from commit 8a9362f) Signed-off-by: Ying Xie <ying.xie@microsoft.com>
…/fib (sonic-net#4394)" (sonic-net#4657) This reverts sonic-net#4394. What I did Remove build dependency on libnexthopgroup to unblock CI failures. This lib is not actively used in SWSS at the moment. Why I did it sonic-net/sonic-buildimage#27629 is part of the libyang1 to libyang3 migration and causes libnexthopgroup to not be built as part of the common-libs pipeline. Previously when the migration was in progress, both libyang1 and 3 were being built. All packages which were dependent on libyang3 (including libnexthopgroup transitively via FRR) were built as part of common-libs due to some serialization logic to prevent libyang1 and 3 from conflicting in sonic-buildimage at build time. Now that libyang1 is completely removed, this serialization logic doesn't exist anymore and libnexthopgroup is not built as part of common-libs, which causes the SWSS build to fail since libnexthopgroup is missing. (cherry picked from commit a87a1bc) Signed-off-by: Ying Xie <ying.xie@microsoft.com>
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What I did
Backport two already-merged master fixes to
202605together, because neither passes CI on202605without the other — they unblock different stages of the same build:[azp] Download VPP artifact 'vpp-<debian version>' #4639 —
[azp] Download VPP artifact 'vpp-<debian version>'(commit 8a9362f)The
sonic-net/sonic-platform-vpppipeline renamed its artifact (vpp→vpp-bookworm/vpp-trixie) when the Trixie build was added (sonic-platform-vpp#248). On202605,build-template.ymlstill hardcodesartifact: vpp, so the dep download fails with "Artifact vpp was not found" and the swss compile never runs. This parametrizes the VPP artifact name per Debian version.Revert "[fpmsyncd]: add libnexthopgroup in Makefile.am to support rib/fib" #4657 —
Revert "[fpmsyncd]: add libnexthopgroup in Makefile.am (#4394)"(commit a87a1bc)fpmsyncdon202605links-lnexthopgroup, butlibnexthopgroupis no longer published by thecommon_libspipeline after the libyang1→libyang3 migration (see Revert "[fpmsyncd]: add libnexthopgroup in Makefile.am to support rib/fib" #4657 / sonic-buildimage#27629). This makes thefpmsyncdlink step fail with "cannot find -lnexthopgroup". master already reverted this;202605did not. Reverting removes the build dependency (the lib is not actively used in SWSS at the moment), matching master.Why combine them in one PR
fpmsyncdfails to link-lnexthopgroup(common_libs on202605has no such deb).vppartifact download.202605swss build.Why I did it
The
202605sonic-swssbranch CI is currently red for all PRs (e.g. the swss-common downstream build buildId 1138029 and the baseline branch build 1137885) due to these two issues. This unblocks the branch.How I verified it
origin/202605with no conflicts.fpmsyncd_LDADDno longer references-lnexthopgroup.vpp_artifact_nameis parameterized (vpp-${{ debian_version }}) inazure-pipelines.yml/build-template.yml.Notes
libnexthopgroup([fpmsyncd]: add libnexthopgroup in Makefile.am to support rib/fib #4394) can be re-landed on202605later oncecommon_libspublishes the lib again (the same path master is taking via sonic-buildimage#27807).cc: backport of #4639 and #4657 to 202605.