Frr bookworm upgrade #18233

hasan-brcm · 2024-03-01T01:06:20Z

Why I did it

Migrate FRR To bookworm.

Work item tracking

Microsoft ADO (number only):

How I did it

Makefile and docker config changes to refer to bookworm instead of bullseye.

How to verify it

Build bookworm frr docker.

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

Tested branch (Please provide the tested image version)

Description for the changelog

Migrate FRR to bookworm.

Link to config_db schema for YANG module changes

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

mssonicbld · 2024-03-01T01:15:47Z

@StormLiangMS,@liushilongbuaa PR: #18233 is conflict with MS internal repo
Please complete the following PR by pushing fix commit to sonicbld/conflict_prefix/18233-fix
https://msazure.visualstudio.com/One/_git/Networking-acs-buildimage/pullrequest/9624651
Then comment "/azpw ms_conflict" to rerun PR checker.

liushilongbuaa · 2024-03-01T09:06:04Z

/azpw ms_conflict

saiarcot895 · 2024-03-07T21:53:33Z

Might be blocked on #18150.

hasan-brcm · 2024-03-08T07:29:52Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2024-03-08T07:29:59Z

Commenter does not have sufficient privileges for PR 18233 in repo sonic-net/sonic-buildimage

hasan-brcm · 2024-04-16T22:25:01Z

/azpw run Azure.sonic-buildimage

mssonicbld · 2024-04-16T22:25:03Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2024-04-16T22:25:14Z

Azure Pipelines successfully started running 1 pipeline(s).

saiarcot895 · 2024-04-22T18:58:48Z

@hasan-brcm Can you trigger a rerun of the PR checks?

hasan-brcm · 2024-04-22T19:07:23Z

Azure Pipelines successfully started running 1 pipeline(s).

Apr 16 run failed due to libsnmp:
dh: error: unable to load addon python2: Can't locate Debian/Debhelper/Sequence/python2.pm in @inc (you may need to install the Debian::Debhelper::Sequence::python2 module) (@inc contains: /etc/perl /usr/local/lib/x86_64-linux-gnu/perl/5.36.0 /usr/local/share/perl/5.36.0 /usr/lib/x86_64-linux-gnu/perl5/5.36 /usr/share/perl5 /usr/lib/x86_64-linux-gnu/perl-base /usr/lib/x86_64-linux-gnu/perl/5.36 /usr/share/perl/5.36 /usr/local/lib/site_perl) at (eval 13) line 1.
BEGIN failed--compilation aborted at (eval 13) line 1.

make[2]: *** [debian/rules:43: clean] Error 25
make[2]: Leaving directory '/sonic/src/snmpd/net-snmp-5.7.3+dfsg'
dpkg-buildpackage: error: fakeroot debian/rules clean subprocess returned exit status 2
make[1]: *** [Makefile:35: /sonic/target/debs/bookworm/libsnmp-base_5.7.3+dfsg-5_all.deb] Error 2
make[1]: Leaving directory '/sonic/src/snmpd'
[ FAIL LOG END ] [ target/debs/bookworm/libsnmp-base_5.7.3+dfsg-5_all.deb ]
make: *** [slave.mk:733: target/debs/bookworm/libsnmp-base_5.7.3+dfsg-5_all.deb] Error 1

hasan-brcm · 2024-04-22T19:07:43Z

/azpw run Azure.sonic-buildimage

mssonicbld · 2024-04-22T19:07:46Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2024-04-22T19:07:59Z

Azure Pipelines successfully started running 1 pipeline(s).

saiarcot895 · 2024-04-22T20:45:43Z

Could you remove the if-check and TODO comment in rules/libyang.mk? I added this during the Bookworm base image upgrade so that it wouldn't try to build unnecessary packages for Bookworm, but it is needed now.

mssonicbld · 2024-04-22T21:08:49Z

@StormLiangMS,@liushilongbuaa PR: #18233 is conflict with MS internal repo
Please push fix commit to sonicbld/precheck/head/18233 and approve
https://msazure.visualstudio.com/One/_git/Networking-acs-buildimage/pullrequest/9943417
After ms PR is merged, comment "/azpw ms_conflict" to rerun PR checker.

hasan-brcm · 2024-04-22T21:34:06Z

Could you remove the if-check and TODO comment in rules/libyang.mk? I added this during the Bookworm base image upgrade so that it wouldn't try to build unnecessary packages for Bookworm, but it is needed now.

Done. Thx!

saiarcot895 · 2024-04-23T17:42:15Z

@hasan-brcm Looks like there are build failures in building FRR for Bookworm, can you resolve those?

Also, were you able to successfully build FRR for Bookworm locally?

saiarcot895 · 2024-05-07T00:36:41Z

Hi @hasan-brcm any update here?

hasan-brcm · 2024-05-08T23:26:49Z

/azpw run Azure.sonic-buildimage

mssonicbld · 2024-05-08T23:26:52Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2024-05-08T23:27:03Z

Azure Pipelines successfully started running 1 pipeline(s).

hasan-brcm · 2024-05-22T07:46:14Z

/azpw run Azure.sonic-buildimage

mssonicbld · 2024-05-22T07:46:17Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2024-05-22T07:46:27Z

Azure Pipelines successfully started running 1 pipeline(s).

zhangyanzhao · 2024-05-22T16:14:56Z

still target 202405 release

StormLiangMS

LGTM

StormLiangMS · 2024-05-23T01:21:07Z

hi @hasan-brcm @saiarcot895 this change LGTM, but I got one question for the support of bookworm.

For BRCM SDK, I remember the current version we planed for 202405 release (11?) supports only bullseye. So for 202405, there would be only one container stay in bullseye, it is the syncd. All other containers would go to bookworm. And for later release, start from 202411, the syncd and others would be landed on bookworm, is this correct?

adyeung · 2024-05-23T04:45:29Z

@StormLiangMS BRCM SDK will remain on bookworm until 202411, eg, platform/broadcom/docker-syncd-brcm

saiarcot895 · 2024-05-23T18:32:10Z

/azpw ms_conflict

liushilongbuaa · 2024-05-25T14:05:23Z

/azpw ms_conflict -f

liushilongbuaa · 2024-05-27T05:15:44Z

/azpw ms_conflict

hasan-brcm · 2024-05-31T01:06:26Z

/azpw run Azure.sonic-buildimage

mssonicbld · 2024-05-31T01:10:39Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2024-05-31T01:10:47Z

Azure Pipelines successfully started running 1 pipeline(s).

lguohan · 2024-06-01T05:16:39Z

/azpw ms_conflict

saiarcot895 · 2024-06-01T15:00:43Z

/azpw ms_conflict

lguohan · 2024-06-01T19:50:28Z

/azpw ms_conflict

liushilongbuaa · 2024-06-03T05:26:33Z

/azpw ms_conflict

Co-authored-by: Kalimuthu Velappan <kalimuthu.velappan@broadcom.com>

Kalimuthu-Velappan and others added 2 commits February 29, 2024 22:35

Fix for build hooks debian permission error

4d60a7e

Migrate FRR to bookworm.

b9d07e3

hasan-brcm requested review from qiluo-msft, xumia and lguohan as code owners March 1, 2024 01:06

Revert Makefile change.

d0bf7e5

saiarcot895 added the Bookworm label Mar 13, 2024

Update libyang.mk

41c4b79

saiarcot895 mentioned this pull request May 1, 2024

SONiC container upgrade to Bookworm (Debian 12) sonic-net/SONiC#1541

Closed

hasan-brcm added 2 commits May 21, 2024 12:02

Merge branch 'sonic-net:master' into frr_bookworm_upgrade

c82eea1

Update test_bbr.py

107850d

hasan-brcm requested a review from StormLiangMS as a code owner May 22, 2024 07:44

Update test_setsrc.py

f51e522

StormLiangMS previously approved these changes May 23, 2024

View reviewed changes

saiarcot895 approved these changes May 23, 2024

View reviewed changes

hasan-brcm added 2 commits May 30, 2024 17:33

Merge branch 'sonic-net:master' into frr_bookworm_upgrade

57fb763

Update test_bbr.py

10dde38

hasan-brcm dismissed StormLiangMS’s stale review via 10dde38 May 31, 2024 01:03

Update test_setsrc.py

70af120

saiarcot895 approved these changes Jun 1, 2024

View reviewed changes

lguohan merged commit 9cbaf42 into sonic-net:master Jun 3, 2024
20 checks passed

adyeung mentioned this pull request May 7, 2024

Bookworm Upgrade LLDP, SNMP subagent, ICCPD, PDE, NAT, FRR sonic-net/SONiC#1677

Closed

arun1355492 pushed a commit to arun1355492/sonic-buildimage that referenced this pull request Jul 26, 2024

[Frr]: Frr bookworm upgrade (sonic-net#18233)

1a0b3b5

Co-authored-by: Kalimuthu Velappan <kalimuthu.velappan@broadcom.com>

Frr bookworm upgrade #18233

Frr bookworm upgrade #18233

Conversation

hasan-brcm commented Mar 1, 2024

Why I did it

Work item tracking

How I did it

How to verify it

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

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)

mssonicbld commented Mar 1, 2024

liushilongbuaa commented Mar 1, 2024

saiarcot895 commented Mar 7, 2024

hasan-brcm commented Mar 8, 2024

azure-pipelines bot commented Mar 8, 2024

hasan-brcm commented Apr 16, 2024

mssonicbld commented Apr 16, 2024

azure-pipelines bot commented Apr 16, 2024

saiarcot895 commented Apr 22, 2024

hasan-brcm commented Apr 22, 2024

hasan-brcm commented Apr 22, 2024

mssonicbld commented Apr 22, 2024

azure-pipelines bot commented Apr 22, 2024

saiarcot895 commented Apr 22, 2024

mssonicbld commented Apr 22, 2024

hasan-brcm commented Apr 22, 2024

saiarcot895 commented Apr 23, 2024

saiarcot895 commented May 7, 2024

hasan-brcm commented May 8, 2024

mssonicbld commented May 8, 2024

azure-pipelines bot commented May 8, 2024

hasan-brcm commented May 22, 2024

mssonicbld commented May 22, 2024

azure-pipelines bot commented May 22, 2024

zhangyanzhao commented May 22, 2024

StormLiangMS left a comment

Choose a reason for hiding this comment

StormLiangMS commented May 23, 2024

adyeung commented May 23, 2024

saiarcot895 commented May 23, 2024

liushilongbuaa commented May 25, 2024

liushilongbuaa commented May 27, 2024

hasan-brcm commented May 31, 2024

mssonicbld commented May 31, 2024

azure-pipelines bot commented May 31, 2024

lguohan commented Jun 1, 2024

saiarcot895 commented Jun 1, 2024

lguohan commented Jun 1, 2024

liushilongbuaa commented Jun 3, 2024