Skip to content

gh: ipsec-e2e: fix flaky connection disruptivity test#42780

Merged
julianwiedmann merged 2 commits intomainfrom
pr/jwi/main/gh-key-rotation
Nov 17, 2025
Merged

gh: ipsec-e2e: fix flaky connection disruptivity test#42780
julianwiedmann merged 2 commits intomainfrom
pr/jwi/main/gh-key-rotation

Conversation

@julianwiedmann
Copy link
Copy Markdown
Member

@julianwiedmann julianwiedmann commented Nov 14, 2025 •
edited
Loading

Roll back the change from #40032, and then remove the workaround from #42724 that is no longer required.

@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 Nov 14, 2025
@julianwiedmann
Copy link
Copy Markdown
Member Author

julianwiedmann commented Nov 14, 2025

/ci-ipsec-e2e

@julianwiedmann
Revert ".github/ipsec-key-rotation: shorten to 1m"
05d8f19 
This reverts commit 44faced.

Seems like this helps with addressing
#41012. Let's revert with fire, and
bring it back once we have more confidence.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann
gh: ipsec-e2e: enable no-ipsec-xfrm-error test
ec9112a 
The previous change seems to have addressed the `XfrmOutPolBlock` errors
during key rotation.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann julianwiedmann force-pushed the pr/jwi/main/gh-key-rotation branch from a5e8af7 to ec9112a Compare November 17, 2025 05:52
@julianwiedmann
Copy link
Copy Markdown
Member Author

julianwiedmann commented Nov 17, 2025

/test

@julianwiedmann julianwiedmann added area/CI Continuous Integration testing issue or flake release-note/ci This PR makes changes to the CI. feature/ipsec Relates to Cilium's IPsec feature needs-backport/1.18 This PR / issue needs backporting to the v1.18 branch and removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Nov 17, 2025
@julianwiedmann julianwiedmann changed the title Pr/jwi/main/gh key rotation gh: ipsec-e2e: fix flaky connection disruptivity test Nov 17, 2025
@julianwiedmann julianwiedmann marked this pull request as ready for review November 17, 2025 11:54
@julianwiedmann julianwiedmann requested review from a team as code owners November 17, 2025 11:54
@julianwiedmann
Copy link
Copy Markdown
Member Author

julianwiedmann commented Nov 17, 2025

Enough successful reruns to have a good feeling about this. The one failing run is unrelated.

@julianwiedmann julianwiedmann added dont-merge/bad-bot To prevent MLH from marking ready-to-merge. and removed dont-merge/bad-bot To prevent MLH from marking ready-to-merge. labels Nov 17, 2025
pchaigno
pchaigno approved these changes Nov 17, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

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

Nice!

@julianwiedmann julianwiedmann added this pull request to the merge queue Nov 17, 2025
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Nov 17, 2025
Merged via the queue into main with commit 454860d Nov 17, 2025
574 of 583 checks passed
@julianwiedmann julianwiedmann deleted the pr/jwi/main/gh-key-rotation branch November 17, 2025 12:17
@julianwiedmann julianwiedmann mentioned this pull request Nov 17, 2025
Merged
1 task
@julianwiedmann julianwiedmann added backport/author The backport will be carried out by the author of the PR. and removed needs-backport/1.18 This PR / issue needs backporting to the v1.18 branch labels Nov 17, 2025
@julianwiedmann julianwiedmann added needs-backport/1.16 needs-backport/1.17 This PR / issue needs backporting to the v1.17 branch backport-pending/1.18 The backport for Cilium 1.18.x for this PR is in progress. labels Nov 17, 2025
@github-actions github-actions bot added backport-done/1.18 The backport for Cilium 1.18.x for this PR is done. and removed backport-pending/1.18 The backport for Cilium 1.18.x for this PR is in progress. labels Nov 18, 2025
This was referenced Nov 18, 2025
Closed
Merged
Merged
@julianwiedmann julianwiedmann added backport-pending/1.16 backport-pending/1.17 The backport for Cilium 1.17.x for this PR is in progress. and removed needs-backport/1.16 needs-backport/1.17 This PR / issue needs backporting to the v1.17 branch labels Nov 18, 2025
@github-actions github-actions bot added backport-done/1.16 The backport for Cilium 1.16.x for this PR is done. backport-done/1.17 The backport for Cilium 1.17.x for this PR is done. and removed backport-pending/1.16 backport-pending/1.17 The backport for Cilium 1.17.x for this PR is in progress. labels Nov 19, 2025
@squeed squeed mentioned this pull request Dec 4, 2025
Merged
8 tasks
@cilium-release-bot cilium-release-bot bot moved this to Released in cilium v1.19.0 Feb 3, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pchaigno pchaigno pchaigno approved these changes

Assignees

No one assigned

Labels

area/CI Continuous Integration testing issue or flake backport/author The backport will be carried out by the author of the PR. backport-done/1.16 The backport for Cilium 1.16.x for this PR is done. backport-done/1.17 The backport for Cilium 1.17.x for this PR is done. backport-done/1.18 The backport for Cilium 1.18.x for this PR is done. feature/ipsec Relates to Cilium's IPsec feature 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
cilium v1.19.0
Status: Released

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@julianwiedmann @pchaigno @msune