Skip to content

Update sonic-dash-ha and sonic-swss-common together due to dependencies#1578

Merged
prabhataravind merged 2 commits intoAzure:202506from
prabhataravind:paravind/submodule_update_202506
Sep 10, 2025
Merged

Update sonic-dash-ha and sonic-swss-common together due to dependencies#1578
prabhataravind merged 2 commits intoAzure:202506from
prabhataravind:paravind/submodule_update_202506

Conversation

@prabhataravind
Copy link

@prabhataravind prabhataravind commented Sep 3, 2025

Why I did it

sonic-dash-ha and sonic-swss-common have mutual dependencies and need to be updated together to avoid compilation failures

Work item tracking
  • Microsoft ADO (number only):

How I did it

Update both submodules together

How to verify it

Make sure the build succeeds

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

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

@prabhataravind
Copy link
Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@yue-fred-gao
Copy link

@prabhataravind, in sonic-dash-ha/.gitmodules, should the url be url = https://github.com/Azure/sonic-dash-api.msft.git?
And with branch = 202506?
I ran "git submodule update --init --remote --recursive" in src/sonic-dash-ha but it couldn't pull the sonic-dash-api submodule. I suspect something wrong with .submodules

@prabhataravind
Copy link
Author

@prabhataravind, in sonic-dash-ha/.gitmodules, should the url be url = https://github.com/Azure/sonic-dash-api.msft.git? And with branch = 202506? I ran "git submodule update --init --remote --recursive" in src/sonic-dash-ha but it couldn't pull the sonic-dash-api submodule. I suspect something wrong with .submodules

@yue-fred-gao, I see. I can try updating this url but I am curious as to why dash-api needs to be a submodule of dash-ha. Both are already submodules of buildimage repo. We handle such dependencies between submodules like swss and swss-common or swss and sairedis without creating a submodule relationship between them. Can we revisit this logic?

Signed-off-by: Prabhat Aravind <paravind@microsoft.com>
@prabhataravind prabhataravind force-pushed the paravind/submodule_update_202506 branch from fe158a9 to 9fdd44a Compare September 8, 2025 23:38
@prabhataravind
Copy link
Author

/azp run Azure.sonic-buildimage-msft.PR

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@yue-fred-gao
Copy link

Looks like the issue is not just the URL/branch. I think you probably didn't know the existence of submodule when you ported the change over. So the submodule is not created in sonic-dash-ha. Please run "git submodule add --name crates/sonic-dash-api-proto/sonic-dash-api --branch 202506 https://github.com/Azure/sonic-dash-api.msft.git crates/sonic-dash-api-proto/sonic-dash-api"

@yue-fred-gao
Copy link

There is something special about rust binding for protobuf. it needs to generate rust source code from proto files. We are looking at ways to remove submodule.

@prabhataravind
Copy link
Author

prabhataravind commented Sep 9, 2025

Looks like the issue is not just the URL/branch. I think you probably didn't know the existence of submodule when you ported the change over. So the submodule is not created in sonic-dash-ha. Please run "git submodule add --name crates/sonic-dash-api-proto/sonic-dash-api --branch 202506 https://github.com/Azure/sonic-dash-api.msft.git crates/sonic-dash-api-proto/sonic-dash-api"

hi @yue-fred-gao, it looks like auto cherry-pick somehow didn't add the submodules. I need to check on this with build team but do you mind raising a PR for 202506 sonic-dash-ha repo with the right set of fixes? @zjswhhh for viz.

@yue-fred-gao
Copy link

yue-fred-gao commented Sep 9, 2025

hi @prabhataravind, I created PR Azure/sonic-dash-ha.msft#19 to fix the submodule issue. Then you can pick up the change in this PR.

Signed-off-by: Prabhat Aravind <paravind@microsoft.com>
@prabhataravind
Copy link
Author

/azp run Azure.sonic-buildimage-msft.PR

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@prabhataravind
Copy link
Author

hi @prabhataravind, I created PR Azure/sonic-dash-ha.msft#19 to fix the submodule issue. Then you can pick up the change in this PR.

thanks @yue-fred-gao

Copy link
Contributor

@zjswhhh zjswhhh left a comment

Choose a reason for hiding this comment

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

lgtm

@prabhataravind prabhataravind merged commit cf943bb into Azure:202506 Sep 10, 2025
19 checks passed
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