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

Moving pcied service into sonic-host-services, part #2 #9285

Open
wants to merge 14 commits into
base: master
Choose a base branch
from

Conversation

MaratGubaiev
Copy link
Contributor

@MaratGubaiev MaratGubaiev commented Nov 17, 2021

fixing #7282
pcied moved into sonic-host-services
NOTE The Python Wheel unit-tests disabled due to build issues.
WARNING it should be merged with coupled changes in sonic-buildimage!
See sonic-net/sonic-platform-daemons#226
NOTE sonic-platform-daemons submodule references to https://github.com/MaratGubaiev/sonic-platform-daemons/tree/move_pcied_to_host_services (that is why src/sonic-platform-daemons is conflicting: see the message at the bottom)

Why I did it

How I did it

How to verify it

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)

@MaratGubaiev
Copy link
Contributor Author

/azpw run

@mssonicbld
Copy link
Collaborator

/AzurePipelines run

@azure-pipelines
Copy link

Pull request contains merge conflicts.

@MaratGubaiev
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

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

@MaratGubaiev
Copy link
Contributor Author

MaratGubaiev commented Nov 18, 2021

Hi all!

The conflict is because the src/sonic-platform-daemons submodule references to my fork.
Can we ignore this conflict?

Checking locally, clone is OK, vs and mellanox builds are OK. As far as I can see pcied works at the mellanox platform normally.

Best regards,
Marat Gubaiev

PS

Sorry for "Roman B": he is my alter ego.
(Some troubles with GitHub. I'll fix it ASAP.)

@lguohan @qiluo-msft @xumia @pshulik @sujinmkang

@@ -39,7 +39,9 @@
url = https://github.com/Azure/sonic-platform-common
[submodule "src/sonic-platform-daemons"]
path = src/sonic-platform-daemons
url = https://github.com/Azure/sonic-platform-daemons
url = https://github.com/MaratGubaiev/sonic-platform-daemons
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please check the changes in this file. I don't think it's related.

Copy link
Collaborator

@sujinmkang sujinmkang Nov 19, 2021

Choose a reason for hiding this comment

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

You need to update the submodule with Azure/sonic-platform-daemons not your repo once the changes in sonic-platform-daemon gets merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants