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

Skip IPSec/WireGuard e2e test when the Multicast feature is enabled #6264

Merged

Conversation

luolanzone
Copy link
Contributor

This is an e2e fix because of PR #5920.

@luolanzone luolanzone mentioned this pull request Apr 26, 2024
test/e2e/wireguard_test.go Show resolved Hide resolved
@@ -42,6 +42,7 @@ func TestIPSec(t *testing.T) {
t.Fatalf("Error when setting up test: %v", err)
}
defer teardownTest(t, data)
skipIfMulticastEnabled(t, data)
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Regarding the IPSec test part, do you mean to do config mutation as wireguard test?

Copy link
Contributor

Choose a reason for hiding this comment

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

No, my thought is to keep the two consistent, either both skip the case that "multicast.enabled=false", or use mutate to enforce they are run.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated.

This is an e2e fix because of PR antrea-io#5920.

Signed-off-by: Lan Luo <luola@vmware.com>
@luolanzone luolanzone force-pushed the skip-encryption-e2e-when-multicast-enabled branch from bac8086 to 1563807 Compare April 28, 2024 06:22
skipIfEncapModeIsNot(t, data, config.TrafficEncapModeEncap)
for _, node := range clusterInfo.nodes {
skipIfMissingKernelModule(t, data, node.name, []string{"wireguard"})
}
var previousTrafficEncryptionMode string
var previousMulticastEnabledState bool
Copy link
Contributor Author

Choose a reason for hiding this comment

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

After sync with wenying, we keep both IPSec and WireGuard test in the same way to simply disabled related encryption e2e tests when multicast is enabled. So no need to do this kind of check and restore anymore.

Copy link
Member

@tnqn tnqn left a comment

Choose a reason for hiding this comment

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

LGTM

@tnqn
Copy link
Member

tnqn commented May 10, 2024

/test-e2e
/test-multicast-e2e
/skip-conformance
/skip-networkpolicy

Copy link
Contributor

@wenyingd wenyingd left a comment

Choose a reason for hiding this comment

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

LGTM

@tnqn tnqn merged commit 0f6fcdd into antrea-io:main May 10, 2024
51 of 56 checks passed
@luolanzone luolanzone deleted the skip-encryption-e2e-when-multicast-enabled branch May 11, 2024 01:52
luolanzone added a commit to luolanzone/antrea that referenced this pull request Jun 17, 2024
…ntrea-io#6264)

This is an e2e fix because of PR antrea-io#5920.

Signed-off-by: Lan Luo <luola@vmware.com>
tnqn pushed a commit that referenced this pull request Jun 17, 2024
…6264) (#6451)

This is an e2e fix because of PR #5920.

Signed-off-by: Lan Luo <luola@vmware.com>
luolanzone added a commit to luolanzone/antrea that referenced this pull request Jun 20, 2024
…ntrea-io#6264)

This is an e2e fix because of PR antrea-io#5920.

Signed-off-by: Lan Luo <luola@vmware.com>
tnqn pushed a commit that referenced this pull request Jun 20, 2024
…6264) (#6466)

This is an e2e fix because of PR #5920.

Signed-off-by: Lan Luo <luola@vmware.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants