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

tests: Check received prefixes before immediately sending dynamic capabilities (backport #14756) #14760

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 9, 2023

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

On branch mergify/bp/dev/9.1/pr-14756
Your branch is up to date with 'origin/dev/9.1'.

You are currently cherry-picking commit c12b976c0.
  (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:   tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_graceful_restart.py
	modified:   tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_role.py
	modified:   tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_software_version.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_addpath.py
	deleted by us:   tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_orf.py

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.com

…abilities

If we send capabilities immediately, before receiving an UPDATE message, we end up
with a notification received from the neighbor. Let's wait until we have the fully
converged topology and do the stuff.

Tested locally and can't replicate the failure, let's see how happy is the CI this time.

Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit c12b976)

# Conflicts:
#	tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_addpath.py
#	tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_orf.py
@ton31337
Copy link
Member

ton31337 commented Nov 9, 2023

Manual backport #14763, closing here.

@ton31337 ton31337 closed this Nov 9, 2023
@mergify mergify bot deleted the mergify/bp/dev/9.1/pr-14756 branch November 9, 2023 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dev/9.1 size/L tests Topotests, make check, etc
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant