Remove quagga related code #7476

shi-su · 2021-04-29T03:14:01Z

Why I did it

Quagga is no longer being used. Remove quagga related code (e.g., docker-fpm-quagga, sonic-quagga, etc.).

How I did it

Remove quagga related code.

How to verify it

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)

qiluo-msft · 2021-05-06T22:15:58Z

platform/p4/docker-sonic-p4.mk

@@ -1,31 +0,0 @@
-# docker image for p4 sonic docker image
-
-DOCKER_SONIC_P4 = docker-sonic-p4.gz


p4

Is this related to quagga? Why remove? #Closed

Removing p4 related part is because it uses quagga regardless of the routing stack selected. Updated the PR description to clarify that.

qiluo-msft · 2021-05-06T22:43:22Z

rules/gobgp.mk

@@ -1,5 +0,0 @@
-# gobgp package


gobgp

gobgp itself is not related to quagga. Why remove?

I think the reason is that docker-fpm-gobgp is dependent on docker-fpm-quagga. With docker-fpm-quagga removed, I will need to remove docker-fpm-gobgp. After removing docker-fpm-gobgp, the only place that could use gobgp is docker-sonic-vs. I thought the motivation for keeping gobgp only for docker-sonic-vs is limited. I can undo the removal of gobgp if using it for docker-sonic-vs is necessary or if we have any other scenarios in mind where we should keep gobgp.

Undid removal for gobgp.

let's keep gobgp and p4. only remove quagga.

Reverted removal for gobgp and p4. Note that p4 depends on quagga and docker-fpm-gobgp depends on docker-fpm-quagga, we probably need to do something for these two.

This reverts commit a55b88e.

This reverts commit 1b0ffac.

This reverts commit c13f3f4.

qiluo-msft

LGTM. Please check with other reviewers.

qiluo-msft · 2021-06-01T03:24:52Z

@shi-su Could you update the PR title? I think it is not touching p4.

This reverts commit 62a4603.

Reverts #7476 It remove bgpd.conf.j2 and zebra.conf.j2, which is still used by sonic-config-engine unit test.

#7840) #### Why I did it The PR checkers do not re-run the sonic-config-engine test cases, caused by some of the config files changes not detected. https://sonic-jenkins.westus2.cloudapp.azure.com/job/mellanox/job/buildimage-mlnx-all/660/console … 07:13:24 ====================================================================== 07:13:24 ERROR: test_bgpd_quagga (tests.test_j2files.TestJ2Files) 07:13:24 ---------------------------------------------------------------------- … 07:13:24 ====================================================================== 07:13:24 ERROR: test_zebra_quagga (tests.test_j2files.TestJ2Files) 07:13:24 ---------------------------------------------------------------------- … 07:13:24 error: Test failed: <unittest.runner.TextTestResult run=161 errors=2 failures=0> 07:13:24 [ FAIL LOG END ] [ target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl ] 07:13:24 make: *** [slave.mk:603: target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl] Error 1 07:13:24 Makefile.work:292: recipe for target 'target/sonic-mellanox.bin' failed 07:13:24 make[1]: *** [target/sonic-mellanox.bin] Error 2 07:13:24 make[1]: Leaving directory '/data2/johnar/workspace/mellanox/buildimage-mlnx-all' 07:13:24 Makefile:7: recipe for target 'target/sonic-mellanox.bin' failed 07:13:24 make: *** [target/sonic-mellanox.bin] Error 2 See PR: #7476 #### How I did it Add the depended files. See src/sonic-config-engine/tests/test_j2files.py

sonic-net#7840) #### Why I did it The PR checkers do not re-run the sonic-config-engine test cases, caused by some of the config files changes not detected. https://sonic-jenkins.westus2.cloudapp.azure.com/job/mellanox/job/buildimage-mlnx-all/660/console … 07:13:24 ====================================================================== 07:13:24 ERROR: test_bgpd_quagga (tests.test_j2files.TestJ2Files) 07:13:24 ---------------------------------------------------------------------- … 07:13:24 ====================================================================== 07:13:24 ERROR: test_zebra_quagga (tests.test_j2files.TestJ2Files) 07:13:24 ---------------------------------------------------------------------- … 07:13:24 error: Test failed: <unittest.runner.TextTestResult run=161 errors=2 failures=0> 07:13:24 [ FAIL LOG END ] [ target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl ] 07:13:24 make: *** [slave.mk:603: target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl] Error 1 07:13:24 Makefile.work:292: recipe for target 'target/sonic-mellanox.bin' failed 07:13:24 make[1]: *** [target/sonic-mellanox.bin] Error 2 07:13:24 make[1]: Leaving directory '/data2/johnar/workspace/mellanox/buildimage-mlnx-all' 07:13:24 Makefile:7: recipe for target 'target/sonic-mellanox.bin' failed 07:13:24 make: *** [target/sonic-mellanox.bin] Error 2 See PR: sonic-net#7476 #### How I did it Add the depended files. See src/sonic-config-engine/tests/test_j2files.py

Why I did it Quagga is no longer being used. Remove quagga-related code (e.g., docker-fpm-quagga, sonic-quagga, etc.). How I did it Remove quagga-related code.

Reverts sonic-net#7476 It remove bgpd.conf.j2 and zebra.conf.j2, which is still used by sonic-config-engine unit test.

sonic-net#7840) #### Why I did it The PR checkers do not re-run the sonic-config-engine test cases, caused by some of the config files changes not detected. https://sonic-jenkins.westus2.cloudapp.azure.com/job/mellanox/job/buildimage-mlnx-all/660/console … 07:13:24 ====================================================================== 07:13:24 ERROR: test_bgpd_quagga (tests.test_j2files.TestJ2Files) 07:13:24 ---------------------------------------------------------------------- … 07:13:24 ====================================================================== 07:13:24 ERROR: test_zebra_quagga (tests.test_j2files.TestJ2Files) 07:13:24 ---------------------------------------------------------------------- … 07:13:24 error: Test failed: <unittest.runner.TextTestResult run=161 errors=2 failures=0> 07:13:24 [ FAIL LOG END ] [ target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl ] 07:13:24 make: *** [slave.mk:603: target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl] Error 1 07:13:24 Makefile.work:292: recipe for target 'target/sonic-mellanox.bin' failed 07:13:24 make[1]: *** [target/sonic-mellanox.bin] Error 2 07:13:24 make[1]: Leaving directory '/data2/johnar/workspace/mellanox/buildimage-mlnx-all' 07:13:24 Makefile:7: recipe for target 'target/sonic-mellanox.bin' failed 07:13:24 make: *** [target/sonic-mellanox.bin] Error 2 See PR: sonic-net#7476 #### How I did it Add the depended files. See src/sonic-config-engine/tests/test_j2files.py

Remove docker-fpm-quagga

fd3ced5

shi-su marked this pull request as ready for review April 29, 2021 07:01

shi-su requested a review from lguohan as a code owner April 29, 2021 07:01

shi-su marked this pull request as draft April 29, 2021 07:07

Shi Su added 5 commits May 5, 2021 05:50

remove sonic-quagga

7ecabbf

remove docker-fpm-gobgp

c13f3f4

remove quagga and gobgp related

a55b88e

update config options

6437548

remove p4

1b0ffac

shi-su marked this pull request as ready for review May 6, 2021 01:32

shi-su requested review from qiluo-msft and xumia as code owners May 6, 2021 01:32

shi-su changed the title ~~Remove docker-fpm-quagga~~ Remove quagga related code May 6, 2021

qiluo-msft reviewed May 6, 2021

View reviewed changes

shi-su changed the title ~~Remove quagga related code~~ Remove quagga and p4 related code May 6, 2021

qiluo-msft reviewed May 6, 2021

View reviewed changes

Shi Su added 2 commits May 6, 2021 23:54

Revert "remove quagga and gobgp related"

17d4d18

This reverts commit a55b88e.

Remove quagga related code

77c9468

jleveque added the Cleanup 💧 label May 7, 2021

Shi Su added 3 commits May 11, 2021 23:14

Revert "remove p4"

e078696

This reverts commit 1b0ffac.

Revert "remove docker-fpm-gobgp"

f9c69c4

This reverts commit c13f3f4.

revert option for gobgp

ea58990

qiluo-msft approved these changes May 18, 2021

View reviewed changes

shi-su changed the title ~~Remove quagga and p4 related code~~ Remove quagga related code Jun 1, 2021

shi-su merged commit 62a4603 into sonic-net:master Jun 7, 2021

shi-su deleted the rm_quagga branch June 7, 2021 23:44

qiluo-msft added a commit that referenced this pull request Jun 9, 2021

Revert "Remove quagga related code (#7476)"

5e7c745

This reverts commit 62a4603.

qiluo-msft mentioned this pull request Jun 9, 2021

Revert "Remove quagga related code" #7831

Merged

qiluo-msft added a commit that referenced this pull request Jun 10, 2021

Revert "Remove quagga related code (#7476)" (#7831)

658ed4f

Reverts #7476 It remove bgpd.conf.j2 and zebra.conf.j2, which is still used by sonic-config-engine unit test.

xumia mentioned this pull request Jun 10, 2021

[build]: Fix missing the depended files of dpkg cache in config engine #7840

Merged

4 tasks

shi-su restored the rm_quagga branch June 16, 2021 18:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove quagga related code #7476

Remove quagga related code #7476

shi-su commented Apr 29, 2021 •

edited

Loading

qiluo-msft May 6, 2021 •

edited

Loading

shi-su May 6, 2021

qiluo-msft May 6, 2021

shi-su May 6, 2021

shi-su May 7, 2021

lguohan May 7, 2021

shi-su May 11, 2021

qiluo-msft left a comment

qiluo-msft commented Jun 1, 2021

		@@ -1,31 +0,0 @@
		# docker image for p4 sonic docker image

		DOCKER_SONIC_P4 = docker-sonic-p4.gz

Remove quagga related code #7476

Remove quagga related code #7476

Conversation

shi-su commented Apr 29, 2021 • edited Loading

Why I did it

How I did it

How to verify it

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

Description for the changelog

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

qiluo-msft May 6, 2021 • edited Loading

Choose a reason for hiding this comment

shi-su May 6, 2021

Choose a reason for hiding this comment

qiluo-msft May 6, 2021

Choose a reason for hiding this comment

shi-su May 6, 2021

Choose a reason for hiding this comment

shi-su May 7, 2021

Choose a reason for hiding this comment

lguohan May 7, 2021

Choose a reason for hiding this comment

shi-su May 11, 2021

Choose a reason for hiding this comment

qiluo-msft left a comment

Choose a reason for hiding this comment

qiluo-msft commented Jun 1, 2021

shi-su commented Apr 29, 2021 •

edited

Loading

qiluo-msft May 6, 2021 •

edited

Loading