[code sync] Merge code from sonic-net/sonic-buildimage:202511 to 202511_azd#2625
Merged
mssonicbld merged 6 commits intoJul 9, 2026
Merged
Conversation
mssonicbld
commented
Jul 8, 2026
mssonicbld
commented
Collaborator
Signed-off-by: Aaron Bernardino <aaronber@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Justin Wong <jvwong@arista.com>
…el vulnerability (#28181) Manual cherry-pick of #27299 to 202511. The automatic cherry-pick hit a conflict in dockers/docker-sonic-mgmt/Dockerfile.j2: on 202511 the package install is a single-line `RUN pip install --no-cache-dir` whereas master had the two-line `pip install --upgrade pip && pip install` form, so the combined uv-migration hunk did not apply. Resolved by applying the uv migration on top of the 202511 single-line form. Original change: remove python3-pip and python3-venv (which pull the vulnerable python3-wheel, USN-8221-1) and replace venv/pip with `uv venv` / `uv pip install` (uv provided via COPY --from ghcr.io/astral-sh/uv). (cherry picked from commit 88d44d3) Signed-off-by: Xiawei Jiang <xiaweijiang@microsoft.com>
Collaborator
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
…tically (#28290) #### Why I did it src/sonic-sairedis ``` * 20432f22 - (HEAD -> 202511, origin/202511) [ci]sonic-ubuntu-2ca agent pool: migrate from python3-pip to uv to address S360 vulnerability (Azure#1976) (7 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
202511 already enables PTF_MODIFIED dynamically (True only when the PR modifies docker-ptf). Pass the branch-aligned PTF_IMAGE_TAG (202511) to the sonic-mgmt PR test template so PR tests use the 202511 docker-ptf image instead of master's latest. PR builds only. Signed-off-by: Austin (Ngoc Thang) Pham <austinpham@microsoft.com>
…into 202511_azd
mssonicbld
force-pushed
the
sonicbld/202511_azd-merge
branch
from
3d1de6f to
183fe99
Compare
Collaborator
Author
|
/azp run |
|
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. |
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.