[202605] Backport docker-sonic-mgmt and pipeline updates from master#28536
Open
lunyue-ms wants to merge 1 commit into
Open
[202605] Backport docker-sonic-mgmt and pipeline updates from master#28536lunyue-ms wants to merge 1 commit into
lunyue-ms wants to merge 1 commit into
Conversation
Collaborator
|
/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). |
Align the docker-sonic-mgmt image (Dockerfile.j2), its build/scan pipeline (.azure-pipelines/docker-sonic-mgmt.yml) and scripts/build_sbom.py with master so 202605's mgmt build, SBOM generation and SBOM-based vulnerability scan match master. Branch-specific fields (schedule/pr branch filters and the sonic-mgmt resource ref) target 202605, and the published image is tagged with the branch name (docker-sonic-mgmt:202605 and :202605-lastbuild) instead of :latest/:lastbuild so it never overwrites master's published mgmt image. Signed-off-by: Lun Yue <17232861+lunyue-ms@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
lunyue-ms
force-pushed
the
lunyue/backport-docker-sonic-mgmt-202605
branch
from
July 23, 2026 02:35
a96fc11 to
59acd98
Compare
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
Collaborator
|
This PR has backport request for branch(es): 202605. ---Powered by SONiC BuildBot
|
Collaborator
|
This PR has backport request label(s) for branch(es): 202605, but is missing required test information. Please make sure you tick the tested branch(es) in the Tested branch section and provide test evidence (e.g., 202605: <test result>) in the Test result section as well in your PR description. ---Powered by SONiC BuildBot
|
Collaborator
|
/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). |
yijingyan2
approved these changes
Jul 23, 2026
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.
Why I did it
dockers/docker-sonic-mgmt/and.azure-pipelines/docker-sonic-mgmt.ymlon202605were behindmaster. This aligns the docker-sonic-mgmt image and its build/scan pipeline on202605with master (dependency/security pins, per-container SBOM + SBOM-based vulnerability scan, and the PR-testINCLUDE_JOBS: all).Work item tracking
How I did it
Took master's version of the affected files directly (rather than per-commit cherry-picks) and adjusted the branch-specific bits, as a single signed-off commit:
.azure-pipelines/docker-sonic-mgmt.yml,dockers/docker-sonic-mgmt/Dockerfile.j2andscripts/build_sbom.pyare taken frommaster(Dockerfile.j2andbuild_sbom.pyare byte-identical to master).schedules/prbranch filters and thesonic-mgmtresourceref→202605.docker-sonic-mgmt:202605anddocker-sonic-mgmt:202605-lastbuild— instead of:latest/:lastbuild, so a 202605 build never overwrites master's shareddocker-sonic-mgmt:latest/:lastbuildin the registry. (The local build image tagdocker-sonic-mgmt:latestis left unchanged.)SBOM is kept: 202605 was branched from master after the SBOM feature (#27455) landed, so it already carries the
ENABLE_SBOMmachinery +scripts/sbom_vuln_scan.py+vex/.Squashed into one commit authored & signed off by me so DCO passes — the earlier per-commit cherry-picks failed DCO because the upstream squash-merge author identities did not match their
Signed-off-bylines.How to verify it
Build docker-sonic-mgmt on 202605 with
ENABLE_SBOM=y; confirm the package set/versions and the SBOM/scan output match master. The pipeline publishesdocker-sonic-mgmt:202605.Which release branch to backport (provide reason below if selected)
This PR is itself the backport to
202605of changes already on master.Tested branch
Test result
Pending a build; will update with the tested image version.
Description for the changelog
Align docker-sonic-mgmt image and its SBOM/build pipeline on 202605 with master; publish the image under a branch-qualified tag (
docker-sonic-mgmt:202605).Link to config_db schema for YANG module changes
N/A. No YANG or config_db schema changes.