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(clustering): enable incremental sync in hybrid mode #13914

Merged
merged 3 commits into from
Nov 28, 2024

Conversation

chronolaw
Copy link
Contributor

@chronolaw chronolaw commented Nov 23, 2024

Summary

KAG-5918
KAG-5876

See: #13906 #13876

Checklist

  • The Pull Request has tests
  • A changelog file has been created under changelog/unreleased/kong or skip-changelog label added on PR if changelog is unnecessary. README.md
  • There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE

Issue reference

Fix #[issue number]

@github-actions github-actions bot added the cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee label Nov 23, 2024
@pull-request-size pull-request-size bot added size/M and removed size/S labels Nov 26, 2024
@chronolaw chronolaw marked this pull request as ready for review November 27, 2024 13:10
@@ -40,8 +40,9 @@ fixtures_cp.http_mock.my_server_block = [[
}
]]

-- TODO: reenable the inc sync test
for _, inc_sync in ipairs { "off" } do
for _, v in ipairs({ {"off", "off"}, {"on", "off"}, {"on", "on"}, }) do
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about making it a part of helpers:

Suggested change
for _, v in ipairs({ {"off", "off"}, {"on", "off"}, {"on", "on"}, }) do
for _, v in helpers.all_rpc_combination() do

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice idea, perhaps we could do it in another PR.

@ADD-SP ADD-SP merged commit e457f6c into master Nov 28, 2024
27 checks passed
@ADD-SP ADD-SP deleted the tests/revert_hybrid_inc_sync branch November 28, 2024 06:12
@team-gateway-bot
Copy link
Collaborator

Cherry-pick failed for master, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-13914-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13914-to-master-to-upstream
git checkout -b cherry-pick-13914-to-master-to-upstream
ancref=$(git merge-base ad5fdefe83fe5eb7ff924bd2d5f02a3bb96ed736 125257f7ba93e03205e6811bba7bb5687bbb2f4d)
git cherry-pick -x $ancref..125257f7ba93e03205e6811bba7bb5687bbb2f4d

@github-actions github-actions bot added the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Nov 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention size/M skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants