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

Submodule update for swss #8839

Merged
merged 1 commit into from
Sep 28, 2021

Conversation

AshokDaparthi
Copy link
Contributor

Why I did it

Include PR sonic-net/sonic-swss#1754

How I did it

Sub module update for sonic-swss

How to verify it

Run build

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

Description for the changelog

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

@AshokDaparthi
Copy link
Contributor Author

/azpw run

@mssonicbld
Copy link
Collaborator

/AzurePipelines run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@neethajohn
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@smaheshm
Copy link
Contributor

All the commits mention in description section seem old. Can you check once?

@AshokDaparthi
Copy link
Contributor Author

@smaheshm - i see latest sonic-buildimage is pointing to sonic-swss @ db9ca83 [submodule]: retreat sonic-swss submodule (#8732) 17 days ago. Followed below steps to update submodule. 1#cd sonic-buildimage/src/sonic-swss
git checkout master
2# cd sonic-buildimage
git add src/sonic-swss
3#git push.

I did git log and got below list and added.
git log --graph --decorate --pretty=oneline --abbrev-commit

Let me know if i am missing anything or i need to do only my commit id alone in submodule update?

@smaheshm
Copy link
Contributor

@smaheshm - i see latest sonic-buildimage is pointing to sonic-swss @ db9ca83 [submodule]: retreat sonic-swss submodule (#8732) 17 days ago. Followed below steps to update submodule. 1#cd sonic-buildimage/src/sonic-swss
git checkout master
2# cd sonic-buildimage
git add src/sonic-swss
3#git push.

I did git log and got below list and added.
git log --graph --decorate --pretty=oneline --abbrev-commit

Let me know if i am missing anything or i need to do only my commit id alone in submodule update?

sorry, your update is correct. Was looking at the wrong field.

@prsunny prsunny merged commit 6c40fe4 into sonic-net:master Sep 28, 2021
vaibhavhd added a commit to sonic-net/sonic-swss that referenced this pull request Oct 6, 2021
…T_XOFF_ROOM_WATERMARK_BYTES on a pool where it is not supported (#1857)" (#1945)

This reverts commit 3d6b1f0.

Fix sonic-net/sonic-buildimage#8893

What I did
This commit had earlier caused issue on master image warmboot - sonic-net/sonic-buildimage#8722

To fix this issue, this PR was created to retreat sonic-swss head on buildimage - sonic-net/sonic-buildimage#8732

Now, this commit was again pulled into sonic-buildimage as part of sonic-swss submodule advance:
sonic-net/sonic-buildimage#8839

And, warm-reboot again broke for the same reason.

This change is so that any other swss submodule update on buildimage will not fail warmboot again.
judyjoseph pushed a commit to sonic-net/sonic-swss that referenced this pull request Oct 7, 2021
…T_XOFF_ROOM_WATERMARK_BYTES on a pool where it is not supported (#1857)" (#1945)

This reverts commit 3d6b1f0.

Fix sonic-net/sonic-buildimage#8893

What I did
This commit had earlier caused issue on master image warmboot - sonic-net/sonic-buildimage#8722

To fix this issue, this PR was created to retreat sonic-swss head on buildimage - sonic-net/sonic-buildimage#8732

Now, this commit was again pulled into sonic-buildimage as part of sonic-swss submodule advance:
sonic-net/sonic-buildimage#8839

And, warm-reboot again broke for the same reason.

This change is so that any other swss submodule update on buildimage will not fail warmboot again.
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.

5 participants