Skip to content

[docker-ptf]: Choose PTF image based on branch #14362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
opcoder0 wants to merge 5 commits into from
Closed

[docker-ptf]: Choose PTF image based on branch #14362

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d0d9b7e
[docker-ptf]: Choose PTF image based on branch
opcoder0 Sep 2, 2024
c17b018
Add check to use py3only for all feature branches whose parent is master
opcoder0 Sep 2, 2024
a81b809
Remove -e extra arguments are directly sent to pytest
opcoder0 Sep 2, 2024
04ef042
Use a constant list to determine PTF image type; pass ptf_imagetag in…
opcoder0 Sep 2, 2024
2e81c5f
Refactor: remove extra variable to track ptf image type
opcoder0 Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion .azure-pipelines/run-test-elastictest-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,20 @@ parameters:
type: string
default: ""

- name: MIXED_PTF_IMAGE_BRANCHES
type: object
default:
- 201803
- 201807
- 201811
- 201911
- 202211
- 202012
- 202205
- 202305
- 202311
- 202405

steps:
- ${{ if not(contains(variables['BUILD.REPOSITORY.NAME'], 'sonic-mgmt')) }}:
- script: |
Expand Down Expand Up @@ -191,6 +205,15 @@ steps:
pip install PyYAML

rm -f new_test_plan_id.txt
PTF_IMAGETAG="--ptf_imagetag=py3only"
for old_branch in ${{ parameters.MIXED_PTF_IMAGE_BRANCHES }}
do
if [ $old_branch == "${{ parameters.MGMT_BRANCH }}" ]
then
PTF_IMAGETAG="--ptf_imagetag=internal"
break
fi
done

python ./.azure-pipelines/test_plan.py create \
-t ${{ parameters.TOPOLOGY }} \
Expand All @@ -202,7 +225,7 @@ steps:
--kvm-build-id $(KVM_BUILD_ID) \
--kvm-image-branch "${{ parameters.KVM_IMAGE_BRANCH }}" \
--deploy-mg-extra-params="${{ parameters.DEPLOY_MG_EXTRA_PARAMS }}" \
--common-extra-params="${{ parameters.COMMON_EXTRA_PARAMS }}" \
--common-extra-params="${{ parameters.COMMON_EXTRA_PARAMS }} ${PTF_IMAGETAG}" \
--vm-type ${{ parameters.VM_TYPE }} --num-asic ${{ parameters.NUM_ASIC }} \
--image_url ${{ parameters.IMAGE_URL }} \
--upgrade-image-param="${{ parameters.UPGRADE_IMAGE_PARAM }}" \
Expand Down