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

vtysh: another take at "enable" in vtysh user mode (backport #9166) #9183

Merged
merged 1 commit into from
Jul 28, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 26, 2021

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

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

You are currently cherry-picking commit c54796288.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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/

Recent change in d1b287e only fixed the problem for 3-letter words.

We were still displaying error for longer words starting with "ena":
```
nfware> enac
% Command not allowed: enable
nfware> enad
% Command not allowed: enable
nfware> enaena
% Command not allowed: enable
```

If we don't allow "enable" command in user mode, why add it at all?

Signed-off-by: Igor Ryzhov <[email protected]>
(cherry picked from commit c547962)
@idryzhov idryzhov force-pushed the mergify/bp/stable/8.0/pr-9166 branch from 3f1e61c to d29d7fe Compare July 26, 2021 11:46
@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Jul 26, 2021

Continuous Integration Result: FAILED

Continuous Integration Result: FAILED

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

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 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-20528/artifact/U18ARM7BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20528/frr-source'
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

Ubuntu 18.04 arm7 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/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-20528/artifact/U18ARM7BUILD/config.status/config.status

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-20528/artifact/CI021BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/CI021BUILD/config.status/config.status
Debian 9 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/CI021BUILD/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-20528/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-20528/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-20528/artifact/U18I386BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20528/frr-source'
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
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-20528/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-20528/artifact/U2004AMD64BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20528/frr-source'
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
vtysh/vtysh.c:502:30: error: missing terminating ' character
vtysh/vtysh.c:4484:1: error: expected declaration or statement at end of input
 4484 | }
vtysh/vtysh.c:470:17: error: unused variable saved_node [-Werror=unused-variable]
vtysh/vtysh.c:470:6: error: unused variable saved_ret [-Werror=unused-variable]

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

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-20528/artifact/U1804PPC64LEBUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20528/frr-source'
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/U1804PPC64LEBUILD/config.status/config.status
Ubuntu 18.04 ppc64le build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/U1804PPC64LEBUILD/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-20528/artifact/U1604I386/ErrorLog/log_make.txt)

/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: expected expression before << token
 <<<<<<< HEAD
 ^
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:1: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/U1604I386/config.status/config.status
Ubuntu 16.04 i386 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/U1604I386/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-20528/artifact/U16ARM8BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: expected expression before << token
 <<<<<<< HEAD
 ^
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:1: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

Ubuntu 16.04 arm8 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/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-20528/artifact/U16ARM8BUILD/config.status/config.status

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-20528/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-20528/artifact/DEB11AMD64/ErrorLog/log_make.txt)

/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:1183: WARNING: duplicate clicmd description of debug zebra pbr, other instance in pbr
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
vtysh/vtysh.c:502:30: error: missing terminating ' character
vtysh/vtysh.c:4484:1: error: expected declaration or statement at end of input
 4484 | }
vtysh/vtysh.c:470:17: error: unused variable saved_node [-Werror=unused-variable]
vtysh/vtysh.c:470:6: error: unused variable saved_ret [-Werror=unused-variable]

Debian 11 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/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-20528/artifact/F29BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20528/frr-source'
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

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

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-20528/artifact/U18ARM8BUILD/config.status/config.status Ubuntu 18.04 arm8 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/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-20528/artifact/U18ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20528/frr-source'
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
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-20528/artifact/CI101BUILD/config.status/config.status Ubuntu 16.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/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-20528/artifact/CI101BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: expected expression before << token
 <<<<<<< HEAD
 ^
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:1: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
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-20528/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-20528/artifact/CENTOS8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20528/frr-source'
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

CentOS 8 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/CENTOS8BUILD/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-20528/artifact/CI005BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory `/home/ci/cibuild.20528/frr-source'
deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.  CC       bgpd/bgp_addpath.o
deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed./home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: expected expression before << token
 <<<<<<< HEAD

CentOS 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/CI005BUILD/config.status/config.status
CentOS 7 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/CI005BUILD/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-20528/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-20528/artifact/DEB10BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20528/frr-source'
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

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

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-20528/artifact/FBSD12AMD64/ErrorLog/log_make.txt)

 static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
vtysh/vtysh.c: In function 'vtysh_execute_func':
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/FBSD12AMD64/config.status/config.status
FreeBSD 12 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/FBSD12AMD64/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-20528/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-20528/artifact/CI012BUILD/ErrorLog/log_make.txt)

 static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
vtysh/vtysh.c: In function 'vtysh_execute_func':
vtysh/vtysh.c:478:1: error: expected expression before '<<' token
 <<<<<<< HEAD
 ^
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:1: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

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

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-20528/artifact/CI011BUILD/ErrorLog/log_make.txt)

static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
3 warnings generated.
vtysh/vtysh.c:478:1: error: version control conflict marker in file
<<<<<<< HEAD
^
1 error generated.
gmake[1]: *** [Makefile:9736: vtysh/vtysh.o] Error 1
/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".

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

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-20528/artifact/CI014BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: expected expression before << token
 <<<<<<< HEAD
 ^
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:1: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

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

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-20528/artifact/CI009BUILD/ErrorLog/log_make.txt)

/usr/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:1183: WARNING: duplicate clicmd description of debug zebra pbr, other instance in pbr
vtysh/vtysh.c: In function 'vtysh_execute_func':
vtysh/vtysh.c:478:1: error: version control conflict marker in file
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
vtysh/vtysh.c:502:30: error: missing terminating ' character
vtysh/vtysh.c:4484:1: error: expected declaration or statement at end of input
 4484 | }
vtysh/vtysh.c:470:17: error: unused variable 'saved_node' [-Werror=unused-variable]
vtysh/vtysh.c:470:6: error: unused variable 'saved_ret' [-Werror=unused-variable]

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

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-20528/artifact/U1804AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20528/frr-source'
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

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

Warnings Generated during build:

Checkout code: Successful with additional warnings
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-20528/artifact/U18ARM7BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20528/frr-source'
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

Ubuntu 18.04 arm7 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/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-20528/artifact/U18ARM7BUILD/config.status/config.status

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-20528/artifact/CI021BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/CI021BUILD/config.status/config.status
Debian 9 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/CI021BUILD/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-20528/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-20528/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-20528/artifact/U18I386BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20528/frr-source'
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
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-20528/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-20528/artifact/U2004AMD64BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20528/frr-source'
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
vtysh/vtysh.c:502:30: error: missing terminating ' character
vtysh/vtysh.c:4484:1: error: expected declaration or statement at end of input
 4484 | }
vtysh/vtysh.c:470:17: error: unused variable saved_node [-Werror=unused-variable]
vtysh/vtysh.c:470:6: error: unused variable saved_ret [-Werror=unused-variable]

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

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-20528/artifact/U1804PPC64LEBUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20528/frr-source'
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/U1804PPC64LEBUILD/config.status/config.status
Ubuntu 18.04 ppc64le build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/U1804PPC64LEBUILD/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-20528/artifact/U1604I386/ErrorLog/log_make.txt)

/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: expected expression before << token
 <<<<<<< HEAD
 ^
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:1: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/U1604I386/config.status/config.status
Ubuntu 16.04 i386 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/U1604I386/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-20528/artifact/U16ARM8BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: expected expression before << token
 <<<<<<< HEAD
 ^
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:1: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

Ubuntu 16.04 arm8 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/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-20528/artifact/U16ARM8BUILD/config.status/config.status

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-20528/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-20528/artifact/DEB11AMD64/ErrorLog/log_make.txt)

/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:1183: WARNING: duplicate clicmd description of debug zebra pbr, other instance in pbr
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
vtysh/vtysh.c:502:30: error: missing terminating ' character
vtysh/vtysh.c:4484:1: error: expected declaration or statement at end of input
 4484 | }
vtysh/vtysh.c:470:17: error: unused variable saved_node [-Werror=unused-variable]
vtysh/vtysh.c:470:6: error: unused variable saved_ret [-Werror=unused-variable]

Debian 11 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/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-20528/artifact/F29BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20528/frr-source'
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

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

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-20528/artifact/U18ARM8BUILD/config.status/config.status Ubuntu 18.04 arm8 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/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-20528/artifact/U18ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20528/frr-source'
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
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-20528/artifact/CI101BUILD/config.status/config.status Ubuntu 16.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/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-20528/artifact/CI101BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: expected expression before << token
 <<<<<<< HEAD
 ^
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:1: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
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-20528/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-20528/artifact/CENTOS8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20528/frr-source'
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

CentOS 8 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/CENTOS8BUILD/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-20528/artifact/CI005BUILD/ErrorLog/log_make.txt)

make  all-am
make[1]: Entering directory `/home/ci/cibuild.20528/frr-source'
deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.  CC       bgpd/bgp_addpath.o
deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed./home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: expected expression before << token
 <<<<<<< HEAD

CentOS 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/CI005BUILD/config.status/config.status
CentOS 7 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/CI005BUILD/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-20528/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-20528/artifact/DEB10BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20528/frr-source'
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

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

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-20528/artifact/FBSD12AMD64/ErrorLog/log_make.txt)

 static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
vtysh/vtysh.c: In function 'vtysh_execute_func':
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/FBSD12AMD64/config.status/config.status
FreeBSD 12 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20528/artifact/FBSD12AMD64/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-20528/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-20528/artifact/CI012BUILD/ErrorLog/log_make.txt)

 static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
vtysh/vtysh.c: In function 'vtysh_execute_func':
vtysh/vtysh.c:478:1: error: expected expression before '<<' token
 <<<<<<< HEAD
 ^
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:1: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

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

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-20528/artifact/CI011BUILD/ErrorLog/log_make.txt)

static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
3 warnings generated.
vtysh/vtysh.c:478:1: error: version control conflict marker in file
<<<<<<< HEAD
^
1 error generated.
gmake[1]: *** [Makefile:9736: vtysh/vtysh.o] Error 1
/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".

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

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-20528/artifact/CI014BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:23: SEVERE: Duplicate ID: "cmdoption-configure-arg-net".
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: expected expression before << token
 <<<<<<< HEAD
 ^
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:1: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

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

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-20528/artifact/CI009BUILD/ErrorLog/log_make.txt)

/usr/home/ci/cibuild.20528/frr-source/doc/user/zebra.rst:1183: WARNING: duplicate clicmd description of debug zebra pbr, other instance in pbr
vtysh/vtysh.c: In function 'vtysh_execute_func':
vtysh/vtysh.c:478:1: error: version control conflict marker in file
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
vtysh/vtysh.c:502:30: error: missing terminating ' character
vtysh/vtysh.c:4484:1: error: expected declaration or statement at end of input
 4484 | }
vtysh/vtysh.c:470:17: error: unused variable 'saved_node' [-Werror=unused-variable]
vtysh/vtysh.c:470:6: error: unused variable 'saved_ret' [-Werror=unused-variable]

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

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-20528/artifact/U1804AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.20528/frr-source'
vtysh/vtysh.c: In function vtysh_execute_func:
vtysh/vtysh.c:478:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
vtysh/vtysh.c:502:30: error: missing terminating ' character [-Werror]
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)
vtysh/vtysh.c:502:30: error: missing terminating ' character
 >>>>>>> c54796288 (vtysh: don't install "enable" command in user mode)

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

Report for vtysh.c | 16 issues
===============================================
< ERROR: spaces required around that '<' (ctx:OxW)
< #478: FILE: /tmp/f1-17921/vtysh.c:478:
< ERROR: spaces required around that '==' (ctx:ExO)
< #496: FILE: /tmp/f1-17921/vtysh.c:496:
< ERROR: spaces required around that '==' (ctx:OxO)
< #496: FILE: /tmp/f1-17921/vtysh.c:496:
< ERROR: spaces required around that '==' (ctx:OxO)
< #496: FILE: /tmp/f1-17921/vtysh.c:496:
< ERROR: spaces required around that '=' (ctx:OxE)
< #496: FILE: /tmp/f1-17921/vtysh.c:496:
< WARNING: space prohibited between function name and open parenthesis '('
< #502: FILE: /tmp/f1-17921/vtysh.c:502:
< ERROR: spaces required around that '>' (ctx:OxW)
< #502: FILE: /tmp/f1-17921/vtysh.c:502:
< ERROR: spaces required around that ':' (ctx:VxW)
< #502: FILE: /tmp/f1-17921/vtysh.c:502:

@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20531/

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.

@LabN-CI
Copy link
Collaborator

LabN-CI commented Jul 27, 2021

💚 Basic BGPD CI results: SUCCESS, 0 tests failed

Results table
_ _
Result SUCCESS git merge/9183 d29d7fe
Date 07/27/2021
Start 12:42:00
Finish 13:07:36
Run-Time 25:36
Total 1813
Pass 1813
Fail 0
Valgrind-Errors
Valgrind-Loss
Details vncregress-2021-07-27-12:42:00.txt
Log autoscript-2021-07-27-12:43:11.log.bz2
Memory 486 476 414

For details, please contact louberger

@donaldsharp donaldsharp merged commit 7a864ba into stable/8.0 Jul 28, 2021
@mergify mergify bot deleted the mergify/bp/stable/8.0/pr-9166 branch July 28, 2021 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants