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: add support for ospf instances with unified configs (backport #17331) #17573

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 4, 2024


This is an automatic backport of pull request #17331 done by [Mergify](https://mergify.com).

Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
(cherry picked from commit 92ecd0a)

# Conflicts:
#	tests/topotests/lib/topotest.py
@mergify mergify bot added the conflicts label Dec 4, 2024
Copy link
Author

mergify bot commented Dec 4, 2024

Cherry-pick of 92ecd0a has failed:

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

You are currently cherry-picking commit 92ecd0a5d4.
  (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/lib/topogen.py
	renamed:    tests/topotests/ospf_instance_redistribute/r1/zebra.conf -> tests/topotests/ospf_instance_redistribute/r1/frr.conf
	deleted:    tests/topotests/ospf_instance_redistribute/r1/ospfd-3.conf
	modified:   tests/topotests/ospf_instance_redistribute/test_ospf_instance_redistribute.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/topotests/lib/topotest.py

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

@frrbot frrbot bot added the tests Topotests, make check, etc label Dec 4, 2024
@ton31337 ton31337 closed this Dec 4, 2024
@ton31337 ton31337 deleted the mergify/bp/stable/10.2/pr-17331 branch December 4, 2024 06:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/L stable/10.2 tests Topotests, make check, etc
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants