Skip to content
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.

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

[docker-ptf]: Add teamd dependency to ptf #6994

Merged
merged 2 commits into from
Mar 10, 2021

Conversation

Pterosaur
Copy link
Contributor

Signed-off-by: Ze Gan ganze718@gmail.com

Why I did it

Teamd may be used in PTF to test portchannel case

How I did it

  1. Install 3rd packages needed by teamd in Dockerfile.j2
  2. Add teamd module and its relative modules in docker-ptf.mk

How to verify it

Execute which teamd in ptf container should got the following result.

root@72db4f0d2eec:/# which teamd
/usr/bin/teamd

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

  • 201811
  • 201911
  • 202006
  • 202012

Description for the changelog

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

Signed-off-by: Ze Gan <ganze718@gmail.com>
@Pterosaur Pterosaur requested a review from lguohan as a code owner March 9, 2021 06:25
@@ -2,6 +2,6 @@

DOCKER_PTF = docker-ptf.gz
$(DOCKER_PTF)_PATH = $(DOCKERS_PATH)/docker-ptf
$(DOCKER_PTF)_DEPENDS += $(LIBTHRIFT) $(PYTHON_THRIFT) $(PTF) $(PYTHON_SAITHRIFT)
$(DOCKER_PTF)_DEPENDS += $(LIBTHRIFT) $(PYTHON_THRIFT) $(PTF) $(PYTHON_SAITHRIFT) $(SWSS) $(LIBTEAMDCT) $(LIBTEAM_UTILS)
Copy link
Collaborator

@qiluo-msft qiluo-msft Mar 9, 2021

Choose a reason for hiding this comment

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

SWSS [](start = 84, length = 4)

Why need swss? #Closed

@@ -2,6 +2,6 @@

DOCKER_PTF = docker-ptf.gz
$(DOCKER_PTF)_PATH = $(DOCKERS_PATH)/docker-ptf
$(DOCKER_PTF)_DEPENDS += $(LIBTHRIFT) $(PYTHON_THRIFT) $(PTF) $(PYTHON_SAITHRIFT)
$(DOCKER_PTF)_DEPENDS += $(LIBTHRIFT) $(PYTHON_THRIFT) $(PTF) $(PYTHON_SAITHRIFT) $(SWSS) $(LIBTEAMDCT) $(LIBTEAM_UTILS)
Copy link
Collaborator

@qiluo-msft qiluo-msft Mar 9, 2021

Choose a reason for hiding this comment

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

LIBTEAMDCT) $(LIBTEAM_UTILS [](start = 92, length = 27)

Could you use debian vanilla packages?
No need to install their dependencies explicitly. #Closed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have confirmed that the teamd from vanilla package can be used.

Signed-off-by: Ze Gan <ganze718@gmail.com>
@Pterosaur Pterosaur requested a review from qiluo-msft March 9, 2021 16:32
@qiluo-msft
Copy link
Collaborator

Blocked by another fix #6999

@Pterosaur
Copy link
Contributor Author

/AzurePipelines run

@azure-pipelines
Copy link

Commenter does not have sufficient privileges for PR 6994 in repo Azure/sonic-buildimage

@lguohan lguohan merged commit 5221e68 into sonic-net:master Mar 10, 2021
abdosi pushed a commit that referenced this pull request Mar 10, 2021
Signed-off-by: Ze Gan <ganze718@gmail.com>
raphaelt-nvidia pushed a commit to raphaelt-nvidia/sonic-buildimage that referenced this pull request May 23, 2021
Signed-off-by: Ze Gan <ganze718@gmail.com>
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
Signed-off-by: Ze Gan <ganze718@gmail.com>
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.

4 participants