Skip to content

[PTF-SAIv2]Add ptf docker for sai-ptf (saiv2)#9729

Merged
richardyu-ms merged 2 commits intosonic-net:masterfrom
richardyu-ms:saiv2_ptf_docker
Feb 18, 2022
Merged

[PTF-SAIv2]Add ptf docker for sai-ptf (saiv2)#9729
richardyu-ms merged 2 commits intosonic-net:masterfrom
richardyu-ms:saiv2_ptf_docker

Conversation

@richardyu-ms
Copy link
Contributor

@richardyu-ms richardyu-ms commented Jan 11, 2022

Why I did it

Based on the current ptf docker create a new docker for sai-ptf(saiv2)

How I did it

upgrade related package
use the latest ptf and install it

How to verify it

test done:
NOJESSIE=1 NOSTRETCH=1 NOBULLSEYE=1 ENABLE_SYNCD_RPC=y make target/docker-ptf-sai.gz
BLDENV=buster make -f Makefile.work target/docker-ptf-sai.gz

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106

Description for the changelog

A picture of a cute animal (not mandatory but encouraged)

@richardyu-ms richardyu-ms requested a review from lguohan as a code owner January 11, 2022 12:14
@richardyu-ms richardyu-ms changed the title [PTF-SAIv2]Add ptf dockre for sai-ptf (saiv2) [PTF-SAIv2]Add ptf docker for sai-ptf (saiv2) Jan 12, 2022
@richardyu-ms richardyu-ms force-pushed the saiv2_ptf_docker branch 2 times, most recently from 248cfeb to 8df065f Compare February 8, 2022 11:19
msosyak
msosyak previously approved these changes Feb 8, 2022
Base on current ptf docker create a new docker for sai-ptf(saiv2)
upgrade related package
use the latest ptf and install it

test done:
NOJESSIE=1 NOSTRETCH=1 NOBULLSEYE=1 ENABLE_SYNCD_RPC=y make target/docker-ptf-sai.gz
BLDENV=buster make -f Makefile.work target/docker-ptf-sai.gz
@msosyak
Copy link
Contributor

msosyak commented Feb 9, 2022

Just to make it visible.
This should be merged after #9881

@richardyu-ms richardyu-ms merged commit 2210c82 into sonic-net:master Feb 18, 2022
DOCKER_PTF_SAI = docker-ptf-sai.gz
DOCKER_PTF_BASE = docker-ptf.gz
$(DOCKER_PTF_SAI)_PATH = $(DOCKERS_PATH)/docker-ptf-sai
$(DOCKER_PTF_SAI)_DEPENDS += $(LIBTHRIFT_2) $(PYTHON3_THRIFT_2)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be updated

Suggested change
$(DOCKER_PTF_SAI)_DEPENDS += $(LIBTHRIFT_2) $(PYTHON3_THRIFT_2)
$(DOCKER_PTF_SAI)_DEPENDS += $(LIBTHRIFT_0_14_1) $(PYTHON3_THRIFT_0_14_1)

Also, I believe you should add $(PYTHON_SAITHRIFT) and $(PTF)

qiluo-msft pushed a commit that referenced this pull request Feb 23, 2022
* [PTF-SAIv2]Add ptf dockre for sai-ptf (saiv2)

Base on current ptf docker create a new docker for sai-ptf(saiv2)
upgrade related package
use the latest ptf and install it

test done:
NOJESSIE=1 NOSTRETCH=1 NOBULLSEYE=1 ENABLE_SYNCD_RPC=y make target/docker-ptf-sai.gz
BLDENV=buster make -f Makefile.work target/docker-ptf-sai.gz

* upgrade the thrift to 014
RyoYang pushed a commit that referenced this pull request Mar 16, 2022
* [PTF-SAIv2]Add ptf dockre for sai-ptf (saiv2)

Base on current ptf docker create a new docker for sai-ptf(saiv2)
upgrade related package
use the latest ptf and install it

test done:
NOJESSIE=1 NOSTRETCH=1 NOBULLSEYE=1 ENABLE_SYNCD_RPC=y make target/docker-ptf-sai.gz
BLDENV=buster make -f Makefile.work target/docker-ptf-sai.gz

* upgrade the thrift to 014
RyoYang added a commit that referenced this pull request Mar 17, 2022
Why I did it
To enable PTF-SAI testing on 202111 branch, cherry-pick necessary PR from master

How I did it
Based on the current ptf docker create a new docker for sai-ptf(saiv2)
upgrade related package
use the latest ptf and install it

How to verify it
Tested on DUT

* [PTF-SAIv2]Add ptf docker for sai-ptf (saiv2) (#9729)

* [PTF-SAIv2]Add ptf dockre for sai-ptf (saiv2)

Base on current ptf docker create a new docker for sai-ptf(saiv2)
upgrade related package
use the latest ptf and install it

test done:
NOJESSIE=1 NOSTRETCH=1 NOBULLSEYE=1 ENABLE_SYNCD_RPC=y make target/docker-ptf-sai.gz
BLDENV=buster make -f Makefile.work target/docker-ptf-sai.gz

* upgrade the thrift to 014

* install xmlrunner python3 version (#10086)

Co-authored-by: Yang Wang <[email protected]>
@richardyu-ms richardyu-ms deleted the saiv2_ptf_docker branch January 16, 2023 11:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants