[docker-ptf] Cherry-pick Dockerfile.j2 changes from master to 202605 - #28137
Open
auspham wants to merge 1 commit into
Open
[docker-ptf] Cherry-pick Dockerfile.j2 changes from master to 202605#28137auspham wants to merge 1 commit into
auspham wants to merge 1 commit into
Conversation
Signed-off-by: Austin (Ngoc Thang) Pham <austinpham@microsoft.com>
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
yijingyan2
approved these changes
Jun 29, 2026
Contributor
Author
|
/azpw retry |
Collaborator
|
Retrying failed(or canceled) jobs... |
Collaborator
|
Retrying failed(or canceled) stages in build 1151699: ✅Stage Build:
✅Stage Test:
|
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
Author
|
/azpw retry |
Collaborator
|
Retrying failed(or canceled) jobs... |
Collaborator
|
Retrying failed(or canceled) stages in build 1164405: ✅Stage Test:
|
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-ptf/Dockerfile.j2on202605had drifted frommaster. This cherry-picks the latest docker-ptf changes so the PTF image on202605matchesmaster.Brings over the following upstream PRs (docker-ptf portion): #27340, #28038, #27947, #27801.
Work item tracking
How I did it
Aligned
dockers/docker-ptf/Dockerfile.j2withmaster, resulting in three net changes: bump the Go toolchain 1.25.10 -> 1.25.11 (new SHAs, stdlib fix GO-2026-5039), add the gnmic build-from-source block (pinned upstream commit with golang.org/x/* upgraded), and resolve the python-saithrift egg path dynamically across py3.x. Thep4lang-piversion already matched, so nothing else changed.How to verify it
Build the PTF docker on 202605 and confirm the image builds:
make target/docker-ptf.gz. Inside the image, verifygnmic versionworks andpython3 -c "import switch_sai_thrift"imports successfully.Which release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
Description for the changelog
[docker-ptf] cherry-pick latest Dockerfile.j2 changes from master to 202605