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

[v1.14] test: Remove duplicate Cilium deployments in some datapath config tests #31521

Merged
merged 1 commit into from
Mar 20, 2024

Conversation

qmonnet
Copy link
Member

@qmonnet qmonnet commented Mar 20, 2024

When disabling IPv6 BPF masquerading in datapath configuration tests using the host firewall, we accidentally duplicated the command to deploy Cilium for some of the tests. Let's clean this up to avoid slowing down the tests.

Fixes: 934e1f2 ("daemon: Forbid IPv6 BPF masquerading with the host firewall")

Partial backport from #31511.

When disabling IPv6 BPF masquerading in datapath configuration tests
using the host firewall, we accidentally duplicated the command to
deploy Cilium for some of the tests. Let's clean this up to avoid
slowing down the tests.

Fixes: 934e1f2 ("daemon: Forbid IPv6 BPF masquerading with the host firewall")
Signed-off-by: Quentin Monnet <qmo@qmon.net>
@qmonnet qmonnet added kind/bug/CI This is a bug in the testing code. area/CI Continuous Integration testing issue or flake kind/backports This PR provides functionality previously merged into master. release-note/ci This PR makes changes to the CI. area/host-firewall Impacts the host firewall or the host endpoint. backport/1.15 This PR represents a backport for Cilium 1.15.x of a PR that was merged to main. labels Mar 20, 2024
@qmonnet qmonnet requested a review from a team as a code owner March 20, 2024 09:59
@maintainer-s-little-helper maintainer-s-little-helper bot added the backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. label Mar 20, 2024
@qmonnet
Copy link
Member Author

qmonnet commented Mar 20, 2024

/test-backport-1.14

Copy link
Member

@julianwiedmann julianwiedmann left a comment

Choose a reason for hiding this comment

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

ty!

@julianwiedmann julianwiedmann removed the backport/1.15 This PR represents a backport for Cilium 1.15.x of a PR that was merged to main. label Mar 20, 2024
@julianwiedmann julianwiedmann changed the title test: Remove duplicate Cilium deployments in some datapath config tests [v1.14] test: Remove duplicate Cilium deployments in some datapath config tests Mar 20, 2024
@qmonnet
Copy link
Member Author

qmonnet commented Mar 20, 2024

Not sure how to trigger the Installation and Conformance Test (ipv4) 😕

@julianwiedmann
Copy link
Member

Think we can merge - this only touches test code, and the relevant tests are green.

@julianwiedmann julianwiedmann added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Mar 20, 2024
@jrajahalme jrajahalme merged commit 89a8d32 into cilium:v1.14 Mar 20, 2024
55 checks passed
@qmonnet qmonnet deleted the pr/test-dpconf-dup-1.14 branch March 20, 2024 12:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/CI Continuous Integration testing issue or flake area/host-firewall Impacts the host firewall or the host endpoint. backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. 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
Status: Released
Development

Successfully merging this pull request may close these issues.

None yet

3 participants