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

Fix race condition of deleting ccnp in e2e test #24484

Merged
merged 2 commits into from
Mar 30, 2023

Conversation

jschwinger233
Copy link
Member

@jschwinger233 jschwinger233 commented Mar 21, 2023

There is a flake in e2e test when a test case starts to proceed before ccnp/cnp comes to take effect by cilium-agent. The correct way to delete ccnp/cnp is to run "kubectl delete" followed by "cilium policy wait", and kubectl helper already has such wrappers.

Fixes: #24380

Fix race conditions when deleting CNP / CCNP in e2e tests

@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Mar 21, 2023
@jschwinger233 jschwinger233 marked this pull request as ready for review March 21, 2023 03:41
@jschwinger233 jschwinger233 requested review from a team as code owners March 21, 2023 03:41
@jschwinger233 jschwinger233 added kind/bug/CI This is a bug in the testing code. release-note/ci This PR makes changes to the CI. labels Mar 21, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Mar 21, 2023
@christarazi
Copy link
Member

christarazi commented Mar 21, 2023

/test

Job 'Cilium-PR-K8s-1.25-kernel-4.19' hit: #20723 (85.78% similarity)

Copy link
Member

@christarazi christarazi left a comment

Choose a reason for hiding this comment

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

Nice find!

@jschwinger233
Copy link
Member Author

I believe the CI failure belongs to a known flake #20723, and I can't reproduce it by running locally.

@pchaigno
Copy link
Member

I believe the CI failure belongs to a known flake #20723, and I can't reproduce it by running locally.

I agree. Feel free to mark ready-to-merge once it's reviewed and you have triaged CI failures with a comment.

@pchaigno pchaigno added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Mar 27, 2023
@julianwiedmann
Copy link
Member

julianwiedmann commented Mar 27, 2023

Let's keep 👀 on the HostFW flakes (eg. #22578) for a bit ... maybe this is all what was needed for them?

@jschwinger233 we typically backport CI fixes. Could you check how far back this applies (I would assume v1.11), and add backport labels? 🙏

There is a flake in e2e test when a test case starts to proceed
before ccnp comes to take effect by cilium-agent. The correct way to
delete ccnp is to run "kubectl delete" followed by "cilium policy wait",
and kubectl helper already has such wrappers.

Fixes: cilium#24380

Signed-off-by: Zhichuan Liang <gray.liang@isovalent.com>
There is a flake in e2e test when a test case starts to proceed
before cnp comes to take effect by cilium-agent. The correct way to
delete cnp is to run "kubectl delete" followed by "cilium policy wait",
and kubectl helper already has such wrappers.

Signed-off-by: Zhichuan Liang <gray.liang@isovalent.com>
@julianwiedmann julianwiedmann added needs-backport/1.11 needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch labels Mar 30, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.13.2 Mar 30, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.12.9 Mar 30, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.11.16 Mar 30, 2023
@julianwiedmann
Copy link
Member

No-change push to split the content up into two patches, and CI passed previously.

@julianwiedmann julianwiedmann merged commit 294bcd1 into cilium:master Mar 30, 2023
34 checks passed
@jibi jibi mentioned this pull request Apr 3, 2023
11 tasks
@jibi jibi removed the needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch label Apr 3, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed this from Needs backport from master in 1.13.2 Apr 3, 2023
@jibi jibi added the backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. label Apr 3, 2023
@jibi jibi mentioned this pull request Apr 3, 2023
3 tasks
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Backport pending to v1.13 in 1.13.2 Apr 3, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.12 in 1.12.9 Apr 3, 2023
@jibi jibi mentioned this pull request Apr 3, 2023
1 task
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.11 in 1.11.16 Apr 3, 2023
@jibi jibi added backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. and removed backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. labels Apr 7, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.13 to Backport done to v1.13 in 1.13.2 Apr 7, 2023
@jibi jibi added backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. and removed backport-pending/1.12 labels Apr 7, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.12 to Backport done to v1.12 in 1.12.9 Apr 7, 2023
@jibi jibi added backport-done/1.11 The backport for Cilium 1.11.x for this PR is done. and removed backport-pending/1.11 labels Apr 7, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.11 to Backport done to v1.11 in 1.11.16 Apr 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-done/1.11 The backport for Cilium 1.11.x for this PR is done. backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. kind/bug/CI This is a bug in the testing code. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/ci This PR makes changes to the CI.
Projects
No open projects
1.11.16
Backport done to v1.11
1.12.9
Backport done to v1.12
1.13.2
Backport done to v1.13
Development

Successfully merging this pull request may close these issues.

Fix race condition of CRD deletion in the e2e test suits
6 participants