[docker-ptf] Port changes from master#22181
Merged
wangxin merged 2 commits intosonic-net:202405from Apr 2, 2025
Merged
Conversation
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
ganglyu
approved these changes
Mar 29, 2025
wangxin
approved these changes
Mar 31, 2025
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
patrickmacarthur
pushed a commit
to patrickmacarthur/sonic-buildimage
that referenced
this pull request
Aug 6, 2025
…05 (sonic-net#958) ```<br>* d5fd28c - (HEAD -> 202405) Merge branch '202405' of https://github.com/sonic-net/sonic-buildimage into 202405 (2025-04-11) [Sonic Automation] * 3ec660c - (head/202405) [docker-ptf]: Fix to set /run/sshd permission affecting 202405 (sonic-net#22231) (2025-04-08) [Sai Kiran] * 6fad19a - [submodule] Update submodule sonic-sairedis to the latest HEAD automatically (sonic-net#22215) (2025-04-06) [mssonicbld] * 5b44167 - [202405] Update to Linux 6.1.123 (sonic-net#21924) (2025-04-04) [Saikrishna Arcot] * ec07425 - [docker-ptf] Port changes from master (sonic-net#22181) (2025-04-02) [Sai Kiran] * 0922b06 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (sonic-net#22126) (2025-03-30) [mssonicbld] * bd03187 - Adding default QoS configurations for Arista-7050CX3-32S-C28S4. (sonic-net#22141) (2025-03-26) [mssonicbld]<br>```
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
4 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
The release branches use the mixed (Python 2 + Python 3) image. The release branches use latest tag of docker-ptf. The intent is to have release branches have latest changes for docker-ptf so they are built and published from the release branch. As with Python 3 migration for docker-ptf the "latest" tag will contain a Python 3 only image.
Work item tracking
How I did it
Port changes relevant for mixed image setting from master.
How to verify it
This will be in another PR to enable branch-based tag for 202405.
Which release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
master
Description for the changelog
[docker-ptf]: Port of latest Dockerfile changes from master
Required to enable branch based docker-ptf tag.
Link to config_db schema for YANG module changes
NA
A picture of a cute animal (not mandatory but encouraged)