[code sync] Merge public 202405 into msft 202405 - #3063
Open
Lun Yue (lunyue-ms) wants to merge 14 commits into
Open
Lun Yue (lunyue-ms) wants to merge 14 commits into
Lun Yue (lunyue-ms) wants to merge 14 commits into
Conversation
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it The build fails if kdump is enabled on the build host, even though the relevant build step is performed in a dockerized chroot. ``` + sudo LANG=C chroot ./fsroot-cisco-8000 kdump-config symlinks 5.10.0-23-2-amd64 Cannot change symbolic links when kdump is loaded ... failed! ``` Fixes #5097, Fixes #17023 ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it kdump installation checks if kdump is already running and aborts if so. This is good in most cases, but it's not relevant when installing into a chroot inside a docker container. This adds a basic patch to disable this check during build. Note that the kdump status of the build host is imported into the docker build container via the sysfs file system: ``` $ ls -id /sys/kernel/kexec_crash_loaded && cat /sys/kernel/kexec_crash_loaded 7824 /sys/kernel/kexec_crash_loaded 0 $ docker run --rm debian bash -c "ls -id /sys/kernel/kexec_crash_loaded && cat /sys/kernel/kexec_crash_loaded" 7824 /sys/kernel/kexec_crash_loaded 0 ``` The inodes and file content are identical inside and outside of the container. #### How to verify it <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> 1. Enable kdump on the build host 2. Confirm baseline build fails with the "Cannot change symbolic links when kdump is loaded" error 3. Apply this change and build succeeds #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [x] 202405 - [x] 202411 - [x] 202505 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> master (2975205) #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> [build] fix build failure on kdump-enabled hosts <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it The `sonic-utilities-data_1.0-1_all.deb` target depends on sources from the `src/sonic-utilities` submodule. However, the cache dependency file does not list this submodule as a dependency. So, when the build cache is used, updates to the `src/sonic-utilities` submodule pointer do not trigger the necessary rebuild of `sonic-utilities-data_1.0-1_all.deb`, leading to a stale build output. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Updated `rules/sonic-utilities-data.dep` to include the proper `SMDEP` rules. #### How to verify it 1. Perform a build with the dpkg cache enabled 2. Confirm the new output file `target/debs/bookworm/sonic-utilities-data_1.0-1_all.deb.smdep` is created, containing the submodule dependencies (smdeps) 3. Archive the `target/debs/bookworm/sonic-utilities-data_1.0-1_all.deb` output outside the build workspace 4. Clean the build workspace 5. Update the `src/sonic-utilities` submodule pointer to a new commit that contains different source code 6. Perform another build with the dpkg cache enabled 7. Extract the previous and current `sonic-utilities-data_1.0-1_all.deb` outputs. Confirm that the contents of the debian packages are distinct and contain the expected source based on the respective `src/sonic-utilities` submodule pointers <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [x] 202405 - [x] 202411 - [x] 202505 This is a build bug which silently results in incorrect build outputs when the dpkg cache is used. As such, it should be double committed. #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [x] 202405 (6fad19a) #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> Fix submodule build dependency for sonic-utilities-data <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
Why I did it Migrate agent pool and update j2 accordingly. * [ci] Migrate agent pool from sonicbld-1es to sonicso1ES-amd64 signed-off-by: jianquanye@microsoft.com
Why I did it Fix too many open file error when building image
…tically (#24571) #### Why I did it src/sonic-dash-api ``` * 3f67090 - (HEAD -> 202405, origin/202405) Automated agent pool migration for branch 202405 (Azure#49) (35 minutes ago) [yijingyan2] ``` #### How I did it #### How to verify it #### Description for the changelog
…omatically (#24670) #### Why I did it src/sonic-swss-common ``` * 36f40a1 - (HEAD -> 202405, origin/202405) Automated agent pool migration for branch 202405 (Azure#1107) (21 hours ago) [yijingyan2] ``` #### How I did it #### How to verify it #### Description for the changelog
…tomatically (#25238) #### Why I did it src/sonic-linux-kernel ``` * feaf559 - (HEAD -> 202405, origin/202405) [202405] PCIe AER printk ratelimiting backport (Azure#529) (29 hours ago) [kenneth-arista] * 0c948bf - Automated agent pool migration for branch 202405 (Azure#518) (8 days ago) [yijingyan2] ``` #### How I did it #### How to verify it #### Description for the changelog
Signed-off-by: yijingyan2 <yijingyan@microsoft.com> Signed-off-by: Yijing Yan <yijingyan@microsoft.com>
…D automatically (#25721) #### Why I did it src/sonic-platform-daemons ``` * 5d2cfce - (HEAD -> 202405, origin/202405) [ci][202405] refine pipeline to download necessary artifacts (Azure#764) (11 hours ago) [yijingyan2] ``` #### How I did it #### How to verify it #### Description for the changelog
Support for release 202405 has ended. This PR disables pipeline CICD triggers for the 202405 branch. Signed-off-by: Xin Wang <xiwang5@microsoft.com>
[202405] Upgrade SONiC package Versions
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md CODE_OF_CONDUCT.md LICENSE README.md SECURITY.md SUPPORT.md azure-pipelines failure_prs.log scripts skip_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it Disable ptf docker build in 202411 branch. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it #### How to verify it <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 - [ ] 202511 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com> #### A picture of a cute animal (not mandatory but encouraged)
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md CODE_OF_CONDUCT.md LICENSE README.md SECURITY.md SUPPORT.md azure-pipelines failure_prs.log scripts skip_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it The bullseye-backports section of the repo has been removed from the main repo. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it #### How to verify it Verified by attempting to build slave container: ``` Azure#13 0.522 Get:1 http://archive.debian.org/debian bullseye InRelease [116 kB] Azure#13 0.538 Get:2 http://archive.debian.org/debian bullseye-updates InRelease [44.0 kB] Azure#13 0.538 Get:3 http://archive.debian.org/debian bullseye-backports InRelease [48.9 kB] Azure#13 0.568 Get:4 http://debian-archive.trafficmanager.net/debian-security bullseye-security InRelease [27.2 kB] Azure#13 0.737 Get:5 http://archive.debian.org/debian bullseye/contrib Sources [43.2 kB] Azure#13 0.915 Get:6 http://archive.debian.org/debian bullseye/main Sources [8500 kB] Azure#13 1.037 Get:7 http://debian-archive.trafficmanager.net/debian-security bullseye-security/contrib Sources [1128 B] Azure#13 1.065 Get:8 http://debian-archive.trafficmanager.net/debian-security bullseye-security/main Sources [250 kB] Azure#13 1.133 Get:9 http://debian-archive.trafficmanager.net/debian-security bullseye-security/non-free Sources [1352 B] Azure#13 1.134 Get:10 http://debian-archive.trafficmanager.net/debian-security bullseye-security/main amd64 Packages [389 kB] Azure#13 1.157 Get:11 http://debian-archive.trafficmanager.net/debian-security bullseye-security/contrib amd64 Packages [2880 B] Azure#13 1.157 Get:12 http://debian-archive.trafficmanager.net/debian-security bullseye-security/non-free amd64 Packages [1184 B] Azure#13 1.280 Get:13 http://archive.debian.org/debian bullseye/non-free Sources [81.0 kB] Azure#13 1.605 Get:14 http://archive.debian.org/debian bullseye/contrib amd64 Packages [50.4 kB] Azure#13 1.609 Get:15 http://archive.debian.org/debian bullseye/main amd64 Packages [8066 kB] Azure#13 1.662 Get:16 http://archive.debian.org/debian bullseye/non-free amd64 Packages [96.4 kB] Azure#13 1.662 Get:17 http://archive.debian.org/debian bullseye-updates/main Sources [7908 B] Azure#13 1.663 Get:18 http://archive.debian.org/debian bullseye-updates/main amd64 Packages [18.8 kB] Azure#13 1.663 Get:19 http://archive.debian.org/debian bullseye-backports/non-free amd64 Packages [14.4 kB] Azure#13 1.663 Get:20 http://archive.debian.org/debian bullseye-backports/main amd64 Packages [403 kB] Azure#13 1.665 Get:21 http://archive.debian.org/debian bullseye-backports/contrib amd64 Packages [6164 B] Azure#13 2.755 Fetched 18.2 MB in 2s (8066 kB/s) Azure#13 2.755 Reading package lists... Azure#13 3.212 Reading package lists... Azure#13 3.626 Building dependency tree... Azure#13 3.709 Reading state information... ``` <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 202205 - [ ] 202211 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com> #### A picture of a cute animal (not mandatory but encouraged)
Merge notified public source cfc766e into msft 202405 at 6d264fb. Preserve both histories rather than cherry-picking the tip. Use the upstream March 2026 snapshots with their matching package locks. Remove obsolete NodeSource 14 mirror entries alongside the upstream Dockerfile changes that remove that package source. Keep the msft sonic-platform-daemons gitlink when resolving its conflict. All four configured msft submodule pins, their fork URLs, the Cisco 202405.1.3.22 pin and downstream rsyslog install remain unchanged. Retain the incoming public CI changes, including disabled automatic triggers and PTF builds, without adding CI exceptions. Validation: 18 APT source-generation cases and 15 version-lock generation cases passed using existing repository scripts. The configured amd64 snapshots contain the pinned Bookworm redis-server and Bullseye redis-tools/rsyslog versions. No full image build. Work item: https://dev.azure.com/msazure/One/_workitems/edit/39539503 Source PR: sonic-net/sonic-buildimage#27744 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Lun Yue <lunyue@microsoft.com>
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
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
5 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.
Code-sync merge: please use a merge commit, not squash or rebase.
Preserving the public source ancestry is part of this repair.
Why I did it
Resolve the reported conflict while syncing public
sonic-net/sonic-buildimage:202405intoAzure/sonic-buildimage-msft:202405.The requested source is
cfc766e13eccab4e7603808db3bfa9c5b2dfef17(public PR #27744).
This merges the history through that exact SHA, not a newer public HEAD
and not a selective cherry-pick of the tip.
There are 13 public commits absent from the target's ancestry. Six had
previously contributed content through the squash merge of #1564, so
this count does not mean 13 entirely new sets of code changes.
Work item tracking
How I did it
Create a two-parent merge commit:
6d264fbd7a2c1750c2b104c37b8c38503268009acfc766e13eccab4e7603808db3bfa9c5b2dfef176dfec61b1c89a3233acefbb4e31d5fec0ed04e41files/build/versions/default/versions-mirrorusing theupstream March 2026 snapshots and matching metadata. The complete
files/build/versions/tree matches the requested public source,including the coordinated package update from
public PR #25954.
incoming Dockerfile changes that remove that package source.
src/sonic-platform-daemonsgitlink conflict by keepingthe msft target pointer, as required by the configured sync policy.
sonic-utilities, sonic-swss, sonic-platform-common and
sonic-platform-daemons. Keep the Cisco
202405.1.3.22pin and thedownstream Bullseye rsyslog install unchanged.
triggers in
azure-pipelines.ymland disabled PTF builds. These arepart of the requested upstream history, not newly added CI exceptions.
The first-parent diff contains 79 changed files, mostly the upstream
package-version refresh.
How to verify it
Completed against the exact merge commit:
scripts/build_mirror_config.shexecution cases:Bookworm/Bullseye/Buster, amd64/arm64/armhf, with snapshots enabled
and disabled. Confirmed the selected snapshot URLs and archive
behavior, including generated APT retry configuration.
scripts/versions_manager.py generatecases coveringdocker-database, docker-base-bullseye and the three slave
distributions on amd64/arm64/armhf. Generated mirror locks match
the committed mirror file.
snapshots and confirmed the exact required versions:
Bookworm
redis-server==5:7.0.15-1~deb12u6,Bullseye
redis-tools==5:6.0.16-1+deb11u8, andrsyslog==8.2102.0-2+deb11u1.overrides, clean worktree and no whitespace errors in the merge diff.
Useful inspection commands:
No full SONiC image build or DUT test was performed. CI/release build
coverage remains required before completing the PR.
Which release branch to backport (provide reason below if selected)
None. This repairs the exact
202405synchronization notification;other branches require their own source and target assessment.
Tested branch (Please provide the tested image version)
Source-level validation on msft
202405at merge commit6dfec61b1c89a3233acefbb4e31d5fec0ed04e41.No newly built image version.
Description for the changelog
Resolve public-to-msft 202405 code-sync conflicts while retaining
downstream component pins and restoring public merge ancestry.
Link to config_db schema for YANG module changes
Not applicable; no YANG schema changes in this merge.
A picture of a cute animal (not mandatory but encouraged)
Not included.