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.

Sign up for GitHub

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

Jump to bottom

bgpd: Fix bgp routes filtering by [l]community-list (backport #9343) #9357

Closed
wants to merge 2 commits into from
Closed

bgpd: Fix bgp routes filtering by [l]community-list (backport #9343) #9357

wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 10, 2021

This is an automatic backport of pull request #9343 done by Mergify.
Cherry-pick of f4dd829 has failed:

On branch mergify/bp/stable/8.0/pr-9343
Your branch is up to date with 'origin/stable/8.0'.

You are currently cherry-picking commit f4dd82967.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   bgpd/bgp_clist.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   bgpd/bgp_community_alias.c
	both modified:   bgpd/bgp_community_alias.h

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@ton31337
bgpd: BGP extended [l]community-list regexp match must work with aliases
c7f6c28 
We have to convert BGP alias to numerical format to compare in regexp.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
(cherry picked from commit f4dd829)

# Conflicts:
#	bgpd/bgp_community_alias.c
#	bgpd/bgp_community_alias.h
@ton31337
tests: Make sure BGP filters by community lists work with community a…
af04db7 
…lias

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
(cherry picked from commit 947a27f)
@mergify mergify bot added the conflicts label Aug 10, 2021
@polychaeta polychaeta added bgp tests Topotests, make check, etc labels Aug 10, 2021
@mergify mergify bot mentioned this pull request Aug 10, 2021
Merged
@idryzhov idryzhov closed this Aug 10, 2021
@mergify mergify bot deleted the mergify/bp/stable/8.0/pr-9343 branch August 10, 2021 13:43
@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: FAILED

See below for issues.
CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Get source / Pull Request: Successful

Building Stage: Failed

Ubuntu 18.04 ppc64le build: Failed (click for details)

Make failed for Ubuntu 18.04 ppc64le build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U1804PPC64LEBUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_lcommunity.c:33:0:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
Makefile:9123: recipe for target 'bgpd/bgp_lcommunity.o' failed

Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U1804PPC64LEBUILD/config.status/config.status
Ubuntu 18.04 ppc64le build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U1804PPC64LEBUILD/config.log/config.log.gz

Debian 9 amd64 build: Failed (click for details)

Make failed for Debian 9 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI021BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_lcommunity.c:33:0:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
Makefile:9123: recipe for target 'bgpd/bgp_lcommunity.o' failed

Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI021BUILD/config.status/config.status
Debian 9 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI021BUILD/config.log/config.log.gz

Ubuntu 16.04 i386 build: Failed (click for details)

Make failed for Ubuntu 16.04 i386 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U1604I386/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_lcommunity.c:33:0:
./bgpd/bgp_community_alias.h:45:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./bgpd/bgp_community_alias.h:50:1: error: expected identifier or ( before >> token
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^
Makefile:9123: recipe for target 'bgpd/bgp_lcommunity.o' failed

Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U1604I386/config.status/config.status
Ubuntu 16.04 i386 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U1604I386/config.log/config.log.gz

NetBSD 8 amd64 build: Failed (click for details) NetBSD 8 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI012BUILD/config.log/config.log.gz

Make failed for NetBSD 8 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI012BUILD/ErrorLog/log_make.txt)

 static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
In file included from bgpd/bgp_main.c:67:0:
./bgpd/bgp_community_alias.h:45:1: error: expected identifier or '(' before '<<' token
 <<<<<<< HEAD
 ^
./bgpd/bgp_community_alias.h:50:1: error: expected identifier or '(' before '>>' token
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^
gmake[1]: *** [Makefile:9737: bgpd/bgp_main.o] Error 1

NetBSD 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI012BUILD/config.status/config.status

Ubuntu 18.04 arm7 build: Failed (click for details)

Make failed for Ubuntu 18.04 arm7 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U18ARM7BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_main.c:67:0:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
Makefile:9123: recipe for target 'bgpd/bgp_main.o' failed

Ubuntu 18.04 arm7 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U18ARM7BUILD/config.log/config.log.gz
Ubuntu 18.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U18ARM7BUILD/config.status/config.status

Ubuntu 16.04 amd64 build: Failed (click for details)

Make failed for Ubuntu 16.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI014BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_lcommunity.c:33:0:
./bgpd/bgp_community_alias.h:45:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./bgpd/bgp_community_alias.h:50:1: error: expected identifier or ( before >> token
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^
Makefile:9123: recipe for target 'bgpd/bgp_lcommunity.o' failed

Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI014BUILD/config.status/config.status
Ubuntu 16.04 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI014BUILD/config.log/config.log.gz

Ubuntu 20.04 amd64 build: Failed (click for details) Ubuntu 20.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U2004AMD64BUILD/config.status/config.status

Make failed for Ubuntu 20.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U2004AMD64BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_main.c:67:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
make[1]: *** [Makefile:9738: bgpd/bgp_main.o] Error 1
In file included from bgpd/bgp_clist.c:36:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
make[1]: *** [Makefile:9738: bgpd/bgp_clist.o] Error 1

Ubuntu 20.04 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U2004AMD64BUILD/config.log/config.log.gz

Debian 11 amd64 build: Failed (click for details) Debian 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/DEB11AMD64/config.status/config.status

Make failed for Debian 11 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/DEB11AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_main.c:67:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
make[1]: *** [Makefile:9741: bgpd/bgp_main.o] Error 1
/home/ci/cibuild.20971/frr-source/doc/user/isisd.rst:43: WARNING: duplicate clicmd description of net XX.XXXX. ... .XXX.XX, other instance in fabricd
/home/ci/cibuild.20971/frr-source/doc/user/isisd.rst:53: WARNING: duplicate clicmd description of domain-password [clear | md5] <password>, other instance in fabricd
/home/ci/cibuild.20971/frr-source/doc/user/isisd.rst:58: WARNING: duplicate clicmd description of attached-bit [receive ignore | send], other instance in fabricd
/home/ci/cibuild.20971/frr-source/doc/user/isisd.rst:67: WARNING: duplicate clicmd description of log-adjacency-changes, other instance in fabricd

Debian 11 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/DEB11AMD64/config.log/config.log.gz

Fedora 29 amd64 build: Failed (click for details)

Make failed for Fedora 29 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/F29BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_main.c:67:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
make[1]: *** [Makefile:9737: bgpd/bgp_main.o] Error 1

Fedora 29 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/F29BUILD/config.status/config.status
Fedora 29 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/F29BUILD/config.log/config.log.gz

OpenBSD 6 amd64 build: Failed (click for details)

Make failed for OpenBSD 6 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI011BUILD/ErrorLog/log_make.txt)

gmake[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_route.c:54:
vtysh/../bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
<<<<<<< HEAD
^
1 error generated.
In file included from bgpd/bgp_vty.c:49:
vtysh/../bgpd/bgp_community_alias.h:45:1: error  CC       lib/clippy-command_py.o
: version control conflict marker in file

OpenBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI011BUILD/config.status/config.status
OpenBSD 6 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI011BUILD/config.log/config.log.gz

Debian 10 amd64 build: Failed (click for details) Debian 10 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/DEB10BUILD/config.log/config.log.gz

Make failed for Debian 10 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/DEB10BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_main.c:67:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
make[1]: *** [Makefile:9738: bgpd/bgp_main.o] Error 1

Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/DEB10BUILD/config.status/config.status

FreeBSD 11 amd64 build: Failed (click for details)

Make failed for FreeBSD 11 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI009BUILD/ErrorLog/log_make.txt)

 1033 | static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
In file included from bgpd/bgp_main.c:67:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
gmake[1]: *** [Makefile:9740: bgpd/bgp_main.o] Error 1
/usr/home/ci/cibuild.20971/frr-source/doc/user/isisd.rst:43: WARNING: duplicate clicmd description of net XX.XXXX. ... .XXX.XX, other instance in fabricd
/usr/home/ci/cibuild.20971/frr-source/doc/user/isisd.rst:53: WARNING: duplicate clicmd description of domain-password [clear | md5] <password>, other instance in fabricd
/usr/home/ci/cibuild.20971/frr-source/doc/user/isisd.rst:58: WARNING: duplicate clicmd description of attached-bit [receive ignore | send], other instance in fabricd
/usr/home/ci/cibuild.20971/frr-source/doc/user/isisd.rst:67: WARNING: duplicate clicmd description of log-adjacency-changes, other instance in fabricd

FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI009BUILD/config.status/config.status
FreeBSD 11 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI009BUILD/config.log/config.log.gz

CentOS 7 amd64 build: Failed (click for details)

Make failed for CentOS 7 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI005BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory `/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_lcommunity.c:33:0:
./bgpd/bgp_community_alias.h:45:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./bgpd/bgp_community_alias.h:50:1: error: expected identifier or ( before >> token
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^
make[1]: *** [bgpd/bgp_lcommunity.o] Error 1

CentOS 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI005BUILD/config.status/config.status
CentOS 7 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI005BUILD/config.log/config.log.gz

Ubuntu 16.04 arm8 build: Failed (click for details)

Make failed for Ubuntu 16.04 arm8 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U16ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_main.c:67:0:
./bgpd/bgp_community_alias.h:45:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./bgpd/bgp_community_alias.h:50:1: error: expected identifier or ( before >> token
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^
Makefile:9123: recipe for target 'bgpd/bgp_main.o' failed

Ubuntu 16.04 arm8 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U16ARM8BUILD/config.log/config.log.gz
Ubuntu 16.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U16ARM8BUILD/config.status/config.status

Ubuntu 18.04 arm8 build: Failed (click for details) Ubuntu 18.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U18ARM8BUILD/config.status/config.status Ubuntu 18.04 arm8 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U18ARM8BUILD/config.log/config.log.gz

Make failed for Ubuntu 18.04 arm8 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U18ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_main.c:67:0:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
Makefile:9123: recipe for target 'bgpd/bgp_main.o' failed
Ubuntu 18.04 amd64 build: Failed (click for details)

Make failed for Ubuntu 18.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U1804AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_lcommunity.c:33:0:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
Makefile:9123: recipe for target 'bgpd/bgp_lcommunity.o' failed

Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U1804AMD64/config.status/config.status
Ubuntu 18.04 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U1804AMD64/config.log/config.log.gz

FreeBSD 12 amd64 build: Failed (click for details)

Make failed for FreeBSD 12 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/FBSD12AMD64/ErrorLog/log_make.txt)

 static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
In file included from bgpd/bgp_main.c:67:0:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
gmake[1]: *** [Makefile:9737: bgpd/bgp_main.o] Error 1

FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/FBSD12AMD64/config.status/config.status
FreeBSD 12 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/FBSD12AMD64/config.log/config.log.gz

Ubuntu 18.04 i386 build: Failed (click for details) Ubuntu 18.04 i386 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U18I386BUILD/config.log/config.log.gz Ubuntu 18.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U18I386BUILD/config.status/config.status

Make failed for Ubuntu 18.04 i386 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U18I386BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_lcommunity.c:33:0:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
Makefile:9123: recipe for target 'bgpd/bgp_lcommunity.o' failed
CentOS 8 amd64 build: Failed (click for details) CentOS 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CENTOS8BUILD/config.status/config.status

Make failed for CentOS 8 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CENTOS8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_main.c:67:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
make[1]: *** [Makefile:9737: bgpd/bgp_main.o] Error 1

CentOS 8 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CENTOS8BUILD/config.log/config.log.gz

Ubuntu 16.04 arm7 build: Failed (click for details) Ubuntu 16.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI101BUILD/config.status/config.status Ubuntu 16.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI101BUILD/config.log/config.log.gz

Make failed for Ubuntu 16.04 arm7 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI101BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_main.c:67:0:
./bgpd/bgp_community_alias.h:45:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./bgpd/bgp_community_alias.h:50:1: error: expected identifier or ( before >> token
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^
Makefile:9123: recipe for target 'bgpd/bgp_main.o' failed

Warnings Generated during build:

Checkout code: Successful with additional warnings
Ubuntu 18.04 ppc64le build: Failed (click for details)

Make failed for Ubuntu 18.04 ppc64le build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U1804PPC64LEBUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_lcommunity.c:33:0:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
Makefile:9123: recipe for target 'bgpd/bgp_lcommunity.o' failed

Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U1804PPC64LEBUILD/config.status/config.status
Ubuntu 18.04 ppc64le build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U1804PPC64LEBUILD/config.log/config.log.gz

Debian 9 amd64 build: Failed (click for details)

Make failed for Debian 9 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI021BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_lcommunity.c:33:0:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
Makefile:9123: recipe for target 'bgpd/bgp_lcommunity.o' failed

Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI021BUILD/config.status/config.status
Debian 9 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI021BUILD/config.log/config.log.gz

Ubuntu 16.04 i386 build: Failed (click for details)

Make failed for Ubuntu 16.04 i386 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U1604I386/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_lcommunity.c:33:0:
./bgpd/bgp_community_alias.h:45:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./bgpd/bgp_community_alias.h:50:1: error: expected identifier or ( before >> token
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^
Makefile:9123: recipe for target 'bgpd/bgp_lcommunity.o' failed

Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U1604I386/config.status/config.status
Ubuntu 16.04 i386 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U1604I386/config.log/config.log.gz

NetBSD 8 amd64 build: Failed (click for details) NetBSD 8 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI012BUILD/config.log/config.log.gz

Make failed for NetBSD 8 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI012BUILD/ErrorLog/log_make.txt)

 static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
In file included from bgpd/bgp_main.c:67:0:
./bgpd/bgp_community_alias.h:45:1: error: expected identifier or '(' before '<<' token
 <<<<<<< HEAD
 ^
./bgpd/bgp_community_alias.h:50:1: error: expected identifier or '(' before '>>' token
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^
gmake[1]: *** [Makefile:9737: bgpd/bgp_main.o] Error 1

NetBSD 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI012BUILD/config.status/config.status

Ubuntu 18.04 arm7 build: Failed (click for details)

Make failed for Ubuntu 18.04 arm7 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U18ARM7BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_main.c:67:0:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
Makefile:9123: recipe for target 'bgpd/bgp_main.o' failed

Ubuntu 18.04 arm7 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U18ARM7BUILD/config.log/config.log.gz
Ubuntu 18.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U18ARM7BUILD/config.status/config.status

Ubuntu 16.04 amd64 build: Failed (click for details)

Make failed for Ubuntu 16.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI014BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_lcommunity.c:33:0:
./bgpd/bgp_community_alias.h:45:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./bgpd/bgp_community_alias.h:50:1: error: expected identifier or ( before >> token
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^
Makefile:9123: recipe for target 'bgpd/bgp_lcommunity.o' failed

Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI014BUILD/config.status/config.status
Ubuntu 16.04 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI014BUILD/config.log/config.log.gz

Ubuntu 20.04 amd64 build: Failed (click for details) Ubuntu 20.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U2004AMD64BUILD/config.status/config.status

Make failed for Ubuntu 20.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U2004AMD64BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_main.c:67:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
make[1]: *** [Makefile:9738: bgpd/bgp_main.o] Error 1
In file included from bgpd/bgp_clist.c:36:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
make[1]: *** [Makefile:9738: bgpd/bgp_clist.o] Error 1

Ubuntu 20.04 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U2004AMD64BUILD/config.log/config.log.gz

Debian 11 amd64 build: Failed (click for details) Debian 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/DEB11AMD64/config.status/config.status

Make failed for Debian 11 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/DEB11AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_main.c:67:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
make[1]: *** [Makefile:9741: bgpd/bgp_main.o] Error 1
/home/ci/cibuild.20971/frr-source/doc/user/isisd.rst:43: WARNING: duplicate clicmd description of net XX.XXXX. ... .XXX.XX, other instance in fabricd
/home/ci/cibuild.20971/frr-source/doc/user/isisd.rst:53: WARNING: duplicate clicmd description of domain-password [clear | md5] <password>, other instance in fabricd
/home/ci/cibuild.20971/frr-source/doc/user/isisd.rst:58: WARNING: duplicate clicmd description of attached-bit [receive ignore | send], other instance in fabricd
/home/ci/cibuild.20971/frr-source/doc/user/isisd.rst:67: WARNING: duplicate clicmd description of log-adjacency-changes, other instance in fabricd

Debian 11 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/DEB11AMD64/config.log/config.log.gz

Fedora 29 amd64 build: Failed (click for details)

Make failed for Fedora 29 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/F29BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_main.c:67:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
make[1]: *** [Makefile:9737: bgpd/bgp_main.o] Error 1

Fedora 29 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/F29BUILD/config.status/config.status
Fedora 29 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/F29BUILD/config.log/config.log.gz

OpenBSD 6 amd64 build: Failed (click for details)

Make failed for OpenBSD 6 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI011BUILD/ErrorLog/log_make.txt)

gmake[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_route.c:54:
vtysh/../bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
<<<<<<< HEAD
^
1 error generated.
In file included from bgpd/bgp_vty.c:49:
vtysh/../bgpd/bgp_community_alias.h:45:1: error  CC       lib/clippy-command_py.o
: version control conflict marker in file

OpenBSD 6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI011BUILD/config.status/config.status
OpenBSD 6 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI011BUILD/config.log/config.log.gz

Debian 10 amd64 build: Failed (click for details) Debian 10 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/DEB10BUILD/config.log/config.log.gz

Make failed for Debian 10 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/DEB10BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_main.c:67:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
make[1]: *** [Makefile:9738: bgpd/bgp_main.o] Error 1

Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/DEB10BUILD/config.status/config.status

FreeBSD 11 amd64 build: Failed (click for details)

Make failed for FreeBSD 11 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI009BUILD/ErrorLog/log_make.txt)

 1033 | static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
In file included from bgpd/bgp_main.c:67:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
gmake[1]: *** [Makefile:9740: bgpd/bgp_main.o] Error 1
/usr/home/ci/cibuild.20971/frr-source/doc/user/isisd.rst:43: WARNING: duplicate clicmd description of net XX.XXXX. ... .XXX.XX, other instance in fabricd
/usr/home/ci/cibuild.20971/frr-source/doc/user/isisd.rst:53: WARNING: duplicate clicmd description of domain-password [clear | md5] <password>, other instance in fabricd
/usr/home/ci/cibuild.20971/frr-source/doc/user/isisd.rst:58: WARNING: duplicate clicmd description of attached-bit [receive ignore | send], other instance in fabricd
/usr/home/ci/cibuild.20971/frr-source/doc/user/isisd.rst:67: WARNING: duplicate clicmd description of log-adjacency-changes, other instance in fabricd

FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI009BUILD/config.status/config.status
FreeBSD 11 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI009BUILD/config.log/config.log.gz

CentOS 7 amd64 build: Failed (click for details)

Make failed for CentOS 7 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI005BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory `/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_lcommunity.c:33:0:
./bgpd/bgp_community_alias.h:45:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./bgpd/bgp_community_alias.h:50:1: error: expected identifier or ( before >> token
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^
make[1]: *** [bgpd/bgp_lcommunity.o] Error 1

CentOS 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI005BUILD/config.status/config.status
CentOS 7 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI005BUILD/config.log/config.log.gz

Ubuntu 16.04 arm8 build: Failed (click for details)

Make failed for Ubuntu 16.04 arm8 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U16ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_main.c:67:0:
./bgpd/bgp_community_alias.h:45:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./bgpd/bgp_community_alias.h:50:1: error: expected identifier or ( before >> token
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^
Makefile:9123: recipe for target 'bgpd/bgp_main.o' failed

Ubuntu 16.04 arm8 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U16ARM8BUILD/config.log/config.log.gz
Ubuntu 16.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U16ARM8BUILD/config.status/config.status

Ubuntu 18.04 arm8 build: Failed (click for details) Ubuntu 18.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U18ARM8BUILD/config.status/config.status Ubuntu 18.04 arm8 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U18ARM8BUILD/config.log/config.log.gz

Make failed for Ubuntu 18.04 arm8 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U18ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_main.c:67:0:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
Makefile:9123: recipe for target 'bgpd/bgp_main.o' failed
Ubuntu 18.04 amd64 build: Failed (click for details)

Make failed for Ubuntu 18.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U1804AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_lcommunity.c:33:0:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
Makefile:9123: recipe for target 'bgpd/bgp_lcommunity.o' failed

Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U1804AMD64/config.status/config.status
Ubuntu 18.04 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U1804AMD64/config.log/config.log.gz

FreeBSD 12 amd64 build: Failed (click for details)

Make failed for FreeBSD 12 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/FBSD12AMD64/ErrorLog/log_make.txt)

 static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
In file included from bgpd/bgp_main.c:67:0:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
gmake[1]: *** [Makefile:9737: bgpd/bgp_main.o] Error 1

FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/FBSD12AMD64/config.status/config.status
FreeBSD 12 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/FBSD12AMD64/config.log/config.log.gz

Ubuntu 18.04 i386 build: Failed (click for details) Ubuntu 18.04 i386 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U18I386BUILD/config.log/config.log.gz Ubuntu 18.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U18I386BUILD/config.status/config.status

Make failed for Ubuntu 18.04 i386 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/U18I386BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_lcommunity.c:33:0:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
Makefile:9123: recipe for target 'bgpd/bgp_lcommunity.o' failed
CentOS 8 amd64 build: Failed (click for details) CentOS 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CENTOS8BUILD/config.status/config.status

Make failed for CentOS 8 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CENTOS8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_main.c:67:
./bgpd/bgp_community_alias.h:45:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
./bgpd/bgp_community_alias.h:50:1: error: version control conflict marker in file
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^~~~~~~
make[1]: *** [Makefile:9737: bgpd/bgp_main.o] Error 1

CentOS 8 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CENTOS8BUILD/config.log/config.log.gz

Ubuntu 16.04 arm7 build: Failed (click for details) Ubuntu 16.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI101BUILD/config.status/config.status Ubuntu 16.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI101BUILD/config.log/config.log.gz

Make failed for Ubuntu 16.04 arm7 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20971/artifact/CI101BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20971/frr-source'
In file included from bgpd/bgp_main.c:67:0:
./bgpd/bgp_community_alias.h:45:1: error: expected identifier or ( before << token
 <<<<<<< HEAD
 ^
./bgpd/bgp_community_alias.h:50:1: error: expected identifier or ( before >> token
 >>>>>>> f4dd82967 (bgpd: BGP extended [l]community-list regexp match must work with aliases)
 ^
Makefile:9123: recipe for target 'bgpd/bgp_main.o' failed

Report for bgp_community_alias.c | 22 issues
===============================================
< ERROR: spaces required around that '<' (ctx:OxW)
< #156: FILE: /tmp/f1-7535/bgp_community_alias.c:156:
< ERROR: spaces required around that '==' (ctx:ExO)
< #157: FILE: /tmp/f1-7535/bgp_community_alias.c:157:
< ERROR: spaces required around that '==' (ctx:OxO)
< #157: FILE: /tmp/f1-7535/bgp_community_alias.c:157:
< ERROR: spaces required around that '==' (ctx:OxO)
< #157: FILE: /tmp/f1-7535/bgp_community_alias.c:157:
< ERROR: spaces required around that '=' (ctx:OxE)
< #157: FILE: /tmp/f1-7535/bgp_community_alias.c:157:
< ERROR: space required after that close brace '}'
< #220: FILE: /tmp/f1-7535/bgp_community_alias.c:220:
< WARNING: line over 80 characters
< #226: FILE: /tmp/f1-7535/bgp_community_alias.c:226:
< ERROR: space prohibited before open square bracket '['
< #226: FILE: /tmp/f1-7535/bgp_community_alias.c:226:
< WARNING: space prohibited between function name and open parenthesis '('
< #226: FILE: /tmp/f1-7535/bgp_community_alias.c:226:
< ERROR: spaces required around that '>' (ctx:OxW)
< #226: FILE: /tmp/f1-7535/bgp_community_alias.c:226:
< ERROR: spaces required around that ':' (ctx:VxW)
< #226: FILE: /tmp/f1-7535/bgp_community_alias.c:226:
Report for bgp_community_alias.h | 20 issues
===============================================
< ERROR: spaces required around that '<' (ctx:OxW)
< #45: FILE: /tmp/f1-7535/bgp_community_alias.h:45:
< ERROR: spaces required around that '==' (ctx:ExO)
< #46: FILE: /tmp/f1-7535/bgp_community_alias.h:46:
< ERROR: spaces required around that '==' (ctx:OxO)
< #46: FILE: /tmp/f1-7535/bgp_community_alias.h:46:
< ERROR: spaces required around that '==' (ctx:OxO)
< #46: FILE: /tmp/f1-7535/bgp_community_alias.h:46:
< ERROR: spaces required around that '=' (ctx:OxE)
< #46: FILE: /tmp/f1-7535/bgp_community_alias.h:46:
< WARNING: line over 80 characters
< #50: FILE: /tmp/f1-7535/bgp_community_alias.h:50:
< ERROR: space prohibited before open square bracket '['
< #50: FILE: /tmp/f1-7535/bgp_community_alias.h:50:
< WARNING: space prohibited between function name and open parenthesis '('
< #50: FILE: /tmp/f1-7535/bgp_community_alias.h:50:
< ERROR: spaces required around that '>' (ctx:OxW)
< #50: FILE: /tmp/f1-7535/bgp_community_alias.h:50:
< ERROR: spaces required around that ':' (ctx:VxW)
< #50: FILE: /tmp/f1-7535/bgp_community_alias.h:50:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bgp conflicts tests Topotests, make check, etc
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@NetDEF-CI @idryzhov @polychaeta @ton31337