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/rpc): enable 09-hybrid_mode/01-sync_spec.lua for incremental sync #13959

Merged
merged 2 commits into from
Dec 2, 2024

Conversation

chobits
Copy link
Contributor

@chobits chobits commented Dec 2, 2024

Summary

Enable all tests of 09-hybrid_mode/01-sync_spec.lua under incremental sync on mode

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 KAG-5951

@github-actions github-actions bot added the cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee label Dec 2, 2024
Comment on lines +796 to +801
-- TODO: The API output does include labels and certs when the
-- incremental sync is enabled.
if inc_sync == "off" then
assert.equal("mycloud", v.labels.deployment)
assert.equal("us-east-1", v.labels.region)
end
Copy link
Contributor Author

Choose a reason for hiding this comment

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

For perfect solution, we need to add a feature for incremental sync: https://konghq.atlassian.net/browse/KAG-5935

@chronolaw chronolaw changed the title fix(tests) enable 09-hybrid_mode/01-sync_spec.lua for incremental sync fix(tests): enable 09-hybrid_mode/01-sync_spec.lua for incremental sync Dec 2, 2024
@chronolaw chronolaw changed the title fix(tests): enable 09-hybrid_mode/01-sync_spec.lua for incremental sync tests(clustering/rpc): enable 09-hybrid_mode/01-sync_spec.lua for incremental sync Dec 2, 2024
@windmgc windmgc merged commit fb99349 into master Dec 2, 2024
29 checks passed
@windmgc windmgc deleted the tests/fix_hybrid_mode_01_sync_spec branch December 2, 2024 06:16
@team-gateway-bot
Copy link
Collaborator

team-gateway-bot commented Dec 2, 2024

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-13959-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13959-to-master-to-upstream
git checkout -b cherry-pick-13959-to-master-to-upstream
ancref=$(git merge-base 35aa60546de8d313c792f32afcb3ec71fd179520 8c8da0e653655f9a70bc1f854d92e4a547cad3aa)
git cherry-pick -x $ancref..8c8da0e653655f9a70bc1f854d92e4a547cad3aa

manual cherry-pick: https://github.com/Kong/kong-ee/pull/10922

@github-actions github-actions bot added the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Dec 2, 2024
@kikito kikito removed the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Dec 3, 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 size/M skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants