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

T5779: conntrack: Apply fixes to <set system conntrack timeout custom> (backport #2574) #2802

Merged
merged 1 commit into from Jan 19, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 11, 2024

This is an automatic backport of pull request #2574 done by Mergify.

Backport of the conntrack system from current branch.

(cherry picked from commit fd0bcaf)
(cherry picked from commit 5acf5ac)
(cherry picked from commit 42ff4d8)
(cherry picked from commit 24a1a70)

cpo@LR2.wue3:~$ /usr/libexec/vyos/tests/smoke/cli/test_system_conntrack.py
test_conntrack_hash_size (__main__.TestSystemConntrack.test_conntrack_hash_size) ... ok
test_conntrack_ignore (__main__.TestSystemConntrack.test_conntrack_ignore) ... ok
test_conntrack_module_enable (__main__.TestSystemConntrack.test_conntrack_module_enable) ... ok
test_conntrack_options (__main__.TestSystemConntrack.test_conntrack_options) ... ok
test_conntrack_timeout_custom (__main__.TestSystemConntrack.test_conntrack_timeout_custom) ... ok

----------------------------------------------------------------------
Ran 5 tests in 46.411s

OK

Full make test and make testc also pass

image


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

@mergify mergify bot added the conflicts label Jan 11, 2024
@vyosbot vyosbot requested review from a team, dmbaturin, sarthurdev, zdc, jestabro, sever-sever and c-po and removed request for a team January 11, 2024 15:11
@github-actions github-actions bot added the sagitta VyOS 1.4 LTS label Jan 11, 2024
@c-po
Copy link
Member

c-po commented Jan 18, 2024

@nicolas-fort code-base has diverged on this and cherry-picking is not easily possible. Can you please provide a manual backport?

@c-po c-po force-pushed the mergify/bp/sagitta/pr-2574 branch from eecd8d1 to 840f82a Compare January 18, 2024 21:07
@c-po c-po removed the conflicts label Jan 18, 2024
Backport of the conntrack system from current branch.

(cherry picked from commit fd0bcaf)
(cherry picked from commit 5acf5ac)
(cherry picked from commit 42ff4d8)
(cherry picked from commit 24a1a70)
@c-po c-po force-pushed the mergify/bp/sagitta/pr-2574 branch from 840f82a to 80068c8 Compare January 18, 2024 21:09
@c-po c-po merged commit 9c6aed5 into sagitta Jan 19, 2024
3 checks passed
@mergify mergify bot deleted the mergify/bp/sagitta/pr-2574 branch January 19, 2024 17:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sagitta VyOS 1.4 LTS
2 participants