Convert docker-fpm-frr to buster by joyas-joseph · Pull Request #4920 · sonic-net/sonic-buildimage

joyas-joseph · 2020-07-08T15:12:27Z

Signed-off-by: Joyas Joseph joyas_joseph@dell.com

- Why I did it
This is an enhancement.

- How I did it
Code change

- How to verify it
Build target/docker-fpm-frr.gz
Verify that /etc/apt/sources.list points to buster using docker exec bgp cat /etc/apt/sources.list

BGP neighborship is established.

root@sonic:~# show ip bgp summary 

IPv4 Unicast Summary:
BGP router identifier 10.1.0.1, local AS number 65100 vrf-id 0
BGP table version 1
RIB entries 1, using 184 bytes of memory
Peers 1, using 20 KiB of memory

Neighbor        V         AS MsgRcvd MsgSent   TblVer  InQ OutQ  Up/Down State/PfxRcd
6.1.1.1         4        100      96      96        0    0    0 01:32:04            0

Total number of neighbors 1
root@sonic:~#

- Description for the changelog
Convert docker-fpm-frr to buster

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

pavel-shirshov · 2020-07-08T22:11:44Z

I believe we can avoid building our own swig and libyang for buster.
https://github.com/FRRouting/frr/blob/7bc33bcc1996b554328792d80a8e5557ccaba6f5/doc/developer/building-libyang.rst
Buster includes both dependency. So we could stop building libyang and swig

joyas-joseph · 2020-07-08T22:45:52Z

https://github.com/FRRouting/frr/blob/7bc33bcc1996b554328792d80a8e5557ccaba6f5/doc/developer/building-libyang.rst

patched libyang is required for mgmt-framework.

pavel-shirshov · 2020-07-09T17:27:38Z

@joyas-joseph what about swig? Can we use swig from the repo, and don't build it by ourselves?

joyas-joseph · 2020-07-09T17:31:07Z

@joyas-joseph what about swig? Can we use swig from the repo, and don't build it by ourselves?

Let me take a look.

joyas-joseph · 2020-07-10T19:12:06Z

retest broadcom please

joyas-joseph · 2020-07-10T19:14:07Z

retest vs please

joyas-joseph · 2020-07-14T04:04:39Z

retest broadcom please

joyas-joseph · 2020-07-14T04:04:48Z

retest vs please

build_image.sh

joyas-joseph · 2020-07-14T20:56:34Z

retest broadcom please

lguohan · 2020-07-15T00:59:08Z

@joyas-joseph , can you rebase this pr to the latest master.

sonic-slave-buster/Dockerfile.j2

sonic-slave-stretch/Dockerfile.j2

qiluo-msft

As comments

lguohan · 2020-07-16T05:48:53Z

retest vs please

lguohan · 2020-07-21T10:06:28Z

retest mellanox please

pavel-shirshov · 2020-07-21T15:17:05Z

https://packages.debian.org/buster/swig
buster has required swig version 3.12. How we get 3.10 version in the logs?
3.10 it is previous version
https://packages.debian.org/stretch/swig
Are we sure we move docker to buster?

joyas-joseph · 2020-07-21T19:05:46Z

https://packages.debian.org/buster/swig
buster has required swig version 3.12. How we get 3.10 version in the logs?
3.10 it is previous version
https://packages.debian.org/stretch/swig
Are we sure we move docker to buster?

libyang was being compiled as a dependency for docker-sonic-vs which was using stretch environment and hence the use of 3.0.10 version of swig.
swig in buster environment is version 3.0.12.

joyas-joseph · 2020-07-22T04:05:24Z

retest mellanox please

pavel-shirshov · 2020-07-22T17:21:07Z

Are we going to use binary which is build under stretch with the binary which is building under buster? Is it safe?

joyas-joseph · 2020-07-22T18:17:15Z

Are we going to use binary which is build under stretch with the binary which is building under buster? Is it safe?

The way things are setup is that if we have a stretch docker that requires libyang, then it will be built in a stretch environment and that package will be used in the docker. At the same time, if we have a buster docker that requires libyang, then another libyang is built in buster environment and that package would be used.

After the change to use swig from the distribution, we saw a build failure for 'vs' platform only. Build succeeded for other platforms. This was because 'vs' platform had 'docker-sonic-vs' which was a stretch docker and so libyang was being built for stretch. libyang requires at least 3.0.12 version but stretch had 3.0.10 version. Hence the failure.

Now we have docker-sonic-vs converted to buster and so dont see a case of libyang being built for stretch. Hence the change to add back using swig from the distribution.

lguohan · 2020-07-22T23:00:35Z

retest mellanox please

pavel-shirshov · 2020-07-22T23:19:11Z

Thank you for detailed explanations @joyas-joseph !

lguohan · 2020-07-23T08:30:16Z

it looks like mellanox build keeps failing at the same place.

https://sonic-jenkins.westus2.cloudapp.azure.com/job/mellanox/job/buildimage-mlnx-all-pr/4142/console

joyas-joseph · 2020-07-23T17:59:29Z

it looks like mellanox build keeps failing at the same place.

https://sonic-jenkins.westus2.cloudapp.azure.com/job/mellanox/job/buildimage-mlnx-all-pr/4142/console

make all for mellanox works.

ENABLE_SYNCD_RPC=y make target/docker-syncd-mlnx-rpc.gz target/docker-ptf-mlnx.gz fails with the below message.

[ FAIL LOG START ] [ target/debs/stretch/libsaivs-dev_1.0.0_amd64.deb-uninstall ]
target/debs/stretch/libsaivs-dev_1.0.0_amd64.deb does not exist

Not sure why uninstall is called on something that doesn't exist.

joyas-joseph · 2020-07-23T21:43:51Z

Probably rules for LIBSAIVS and LIBSAIVS_DEV needs to be moved to platform/vs/rules.mk

pavel-shirshov · 2020-07-24T16:53:54Z

Check .dep files.

joyas-joseph · 2020-07-24T20:05:38Z

retest baseimage please

lguohan · 2020-07-25T20:14:36Z

#5039 should solve the mellanox build failure.

Signed-off-by: Joyas Joseph <joyas_joseph@dell.com>

joyas-joseph · 2020-07-28T17:41:26Z

retest vsimage please

joyas-joseph · 2020-07-28T17:41:35Z

retest broadcom please

lguohan · 2020-07-29T10:30:07Z

retest broadcom please

lguohan · 2020-07-29T10:30:16Z

retest vsimage please

lguohan · 2020-07-29T10:30:25Z

retest mellanox please

lguohan requested a review from pavel-shirshov July 8, 2020 15:16

jleveque added Enhancement ➕ FRR 🚥 bgp labels Jul 11, 2020

qiluo-msft force-pushed the master branch from 13769f9 to 39941f0 Compare July 12, 2020 18:13

pavel-shirshov reviewed Jul 14, 2020

View reviewed changes

build_image.sh Outdated Show resolved Hide resolved

pavel-shirshov previously approved these changes Jul 14, 2020

View reviewed changes

joyas-joseph dismissed pavel-shirshov’s stale review via 04e20aa July 15, 2020 03:30

joyas-joseph force-pushed the docker-fpm-frr-buster branch from 7563ed5 to 04e20aa Compare July 15, 2020 03:30

lguohan previously approved these changes Jul 15, 2020

View reviewed changes

pavel-shirshov previously approved these changes Jul 15, 2020

View reviewed changes

qiluo-msft reviewed Jul 15, 2020

View reviewed changes

sonic-slave-buster/Dockerfile.j2 Outdated Show resolved Hide resolved

qiluo-msft reviewed Jul 15, 2020

View reviewed changes

sonic-slave-stretch/Dockerfile.j2 Outdated Show resolved Hide resolved

qiluo-msft requested changes Jul 15, 2020

View reviewed changes

joyas-joseph dismissed stale reviews from pavel-shirshov and lguohan via fe01bee July 15, 2020 17:54

lguohan previously approved these changes Jul 15, 2020

View reviewed changes

qiluo-msft previously approved these changes Jul 15, 2020

View reviewed changes

pavel-shirshov previously approved these changes Jul 16, 2020

View reviewed changes

lguohan previously approved these changes Jul 21, 2020

View reviewed changes

pavel-shirshov previously approved these changes Jul 22, 2020

View reviewed changes

joyas-joseph dismissed stale reviews from pavel-shirshov and lguohan via bf3cdb5 July 23, 2020 18:01

joyas-joseph force-pushed the docker-fpm-frr-buster branch from e291815 to bf3cdb5 Compare July 23, 2020 18:01

joyas-joseph force-pushed the docker-fpm-frr-buster branch from f93df89 to 879edf5 Compare July 24, 2020 18:44

joyas-joseph added 2 commits July 27, 2020 11:17

Convert docker-fpm-frr to buster

ad62499

Signed-off-by: Joyas Joseph <joyas_joseph@dell.com>

Use 'swig' from the distro

eb25e9b

Signed-off-by: Joyas Joseph <joyas_joseph@dell.com>

joyas-joseph force-pushed the docker-fpm-frr-buster branch from 879edf5 to eb25e9b Compare July 27, 2020 18:17

pavel-shirshov approved these changes Jul 29, 2020

View reviewed changes

lguohan merged commit f0dfe36 into sonic-net:master Jul 29, 2020

Conversation

joyas-joseph commented Jul 8, 2020

Uh oh!

pavel-shirshov commented Jul 8, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

joyas-joseph commented Jul 8, 2020

Uh oh!

pavel-shirshov commented Jul 9, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

joyas-joseph commented Jul 9, 2020

Uh oh!

joyas-joseph commented Jul 10, 2020

Uh oh!

joyas-joseph commented Jul 10, 2020

Uh oh!

joyas-joseph commented Jul 14, 2020

Uh oh!

joyas-joseph commented Jul 14, 2020

Uh oh!

Uh oh!

joyas-joseph commented Jul 14, 2020

Uh oh!

lguohan commented Jul 15, 2020

Uh oh!

Uh oh!

Uh oh!

qiluo-msft left a comment

Choose a reason for hiding this comment

Uh oh!

lguohan commented Jul 16, 2020

Uh oh!

lguohan commented Jul 21, 2020

Uh oh!

pavel-shirshov commented Jul 21, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

joyas-joseph commented Jul 21, 2020

Uh oh!

joyas-joseph commented Jul 22, 2020

Uh oh!

pavel-shirshov commented Jul 22, 2020

Uh oh!

joyas-joseph commented Jul 22, 2020

Uh oh!

lguohan commented Jul 22, 2020

Uh oh!

pavel-shirshov commented Jul 22, 2020

Uh oh!

lguohan commented Jul 23, 2020

Uh oh!

joyas-joseph commented Jul 23, 2020

Uh oh!

joyas-joseph commented Jul 23, 2020

Uh oh!

pavel-shirshov commented Jul 24, 2020

Uh oh!

joyas-joseph commented Jul 24, 2020

Uh oh!

lguohan commented Jul 25, 2020

Uh oh!

joyas-joseph commented Jul 28, 2020

Uh oh!

joyas-joseph commented Jul 28, 2020

Uh oh!

lguohan commented Jul 29, 2020

Uh oh!

lguohan commented Jul 29, 2020

Uh oh!

lguohan commented Jul 29, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

pavel-shirshov commented Jul 8, 2020 •

edited

Loading

pavel-shirshov commented Jul 9, 2020 •

edited

Loading

pavel-shirshov commented Jul 21, 2020 •

edited

Loading