[docker-ptf]: Choose PTF image based on branch#14362
[docker-ptf]: Choose PTF image based on branch#14362opcoder0 wants to merge 5 commits intosonic-net:masterfrom
Conversation
* Add condition to pipeline to choose PTF image tag based on the branch. All master branch test scripts hve been migrated to Python 3 and can run in "py3only" PTF image. For all other branches we continue to use "internal" a mixed Py2+Py3 image.
opcoder0
requested review from
lerry-lee,
wangxin,
xwjiang-ms and
yutongzhang-microsoft
| parent_commit=$(git rev-parse HEAD^1) | ||
| master_commit=$(git rev-parse master) | ||
| branch_from_master=0 | ||
| if [ "$parent_commit" == "$master_commit" ] |
There was a problem hiding this comment.
Compare the commit id doesn't make sense to me. Once a branch like 202411 branched out from master in the future, and certainly it could use py3only image, but compare commit id would cause branch_from_master=0 and use internal image
There was a problem hiding this comment.
That's right. Thanks. I will probably use a list of known branches that use mixed and the rest can use py3only.
| PTF_IMAGETAG="--ptf_imagetag=internal" | ||
| fi | ||
| common_extra_params="${{ parameters.COMMON_EXTRA_PARAMS }} $PTF_IMAGETAG" | ||
| echo "##vso[task.setvariable variable=COMMON_EXTRA_PARAMS;]$common_extra_params" |
There was a problem hiding this comment.
This is to create pipeline variable "COMMON_EXTRA_PARAMS". Then subsequent pipeline tasks can access to this pipeline variable.
Since the common extra params is only used this task, it is unnecessary to create such pipeline variable. Just use bash variable should be enough. Then, in line 223, refer to bash variable instead of pipeline parameter.
There was a problem hiding this comment.
Thank you. I have modified that bit.
… the script instead of modifying pipeline var
| ptf_image_type="py3only" | ||
| for old_branch in ${{ parameters.MIXED_PTF_IMAGE_BRANCHES }} | ||
| do | ||
| if [ $old_branch == "${{ parameters.MGMT_BRANCH }}" ] | ||
| then | ||
| ptf_image_type="mixed" | ||
| break | ||
| fi | ||
| done | ||
| PTF_IMAGETAG="--ptf_imagetag=py3only" | ||
| if [ $ptf_image_type == "mixed" ] | ||
| then | ||
| PTF_IMAGETAG="--ptf_imagetag=internal" | ||
| fi |
There was a problem hiding this comment.
ptf_image_type is only used to determine whether should modify PTF_IMAGETAG, how about not use this extra variable,but just modify PTF_IMAGETAG in the for-loop statement when matching if condition?
There was a problem hiding this comment.
Thanks. I've modified it.
|
/azp run |
|
Commenter does not have sufficient privileges for PR 14362 in repo sonic-net/sonic-mgmt |
|
/azp run |
|
Azure Pipelines failed to run 1 pipeline(s). |
|
After offline discussion, the better way to specify ptf_imagetag is to update the default value for ptf_imagetag variable in ansible playbook for each branch: |
Thank you @wangxin. I will be closing this PR as the sequence of work to be done changes. |
4 participants
Description of PR
This PR adds condition to pipeline to choose PTF image tag based on the branch. All
masterbranch test scripts have been migrated to Python 3 and can run inpy3onlyPTF image. For all feature branches branched out ofmasterthe PTF image tag can bepy3only. For all other branches we continue to the internal tag with mixed Py2+Py3 image.Summary:
Fixes # Not applicable
Type of change
Back port request
Approach
What is the motivation for this PR?
All PTF scripts have been migrated to Python 3. And the PTF image with Python 3 only has been built and published. This PR now modifies the PR testing pipeline to choose the PTF image based on the branch. For master branch
py3onlytag can be chosen. For all other release branches, we use the existing mixed image.How did you do it?
Check the "MGMT_BRANCH" to detect current branch and pass the
ptf_imagetagto the pytest framework via common extra parameters.How did you verify/test it?
Can only be verified here.
Any platform specific information?
None
Supported testbed topology if it's a new test case?
None
Documentation
Not applicable.