From 0f6fcdd0b8d180600e993cd89e0fe97c8f5b2dbb Mon Sep 17 00:00:00 2001 From: Lan Date: Fri, 10 May 2024 19:01:43 +0800 Subject: [PATCH] Skip IPSec/WireGuard e2e test when the Multicast feature is enabled (#6264) This is an e2e fix because of PR #5920. Signed-off-by: Lan Luo --- test/e2e/fixtures.go | 10 ++++++++++ test/e2e/ipsec_test.go | 1 + test/e2e/wireguard_test.go | 5 +---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/test/e2e/fixtures.go b/test/e2e/fixtures.go index a8eea87e94a..f2961537181 100644 --- a/test/e2e/fixtures.go +++ b/test/e2e/fixtures.go @@ -159,6 +159,16 @@ func skipIfNoVMs(tb testing.TB) { } } +func skipIfMulticastEnabled(tb testing.TB, data *TestData) { + agentConf, err := data.GetAntreaAgentConf() + if err != nil { + tb.Fatalf("Error getting option multicast.enable value") + } + if agentConf.Multicast.Enable { + tb.Skipf("Skipping test because option multicast.enable is true") + } +} + func skipIfFeatureDisabled(tb testing.TB, feature featuregate.Feature, checkAgent bool, checkController bool) { if checkAgent { if featureGate, err := GetAgentFeatures(); err != nil { diff --git a/test/e2e/ipsec_test.go b/test/e2e/ipsec_test.go index b972f18ecdf..931b8e49f86 100644 --- a/test/e2e/ipsec_test.go +++ b/test/e2e/ipsec_test.go @@ -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) t.Logf("Redeploy Antrea with IPsec tunnel enabled") data.redeployAntrea(t, deployAntreaIPsec) diff --git a/test/e2e/wireguard_test.go b/test/e2e/wireguard_test.go index 89c86b83dbe..5b27a97a746 100644 --- a/test/e2e/wireguard_test.go +++ b/test/e2e/wireguard_test.go @@ -40,17 +40,15 @@ func TestWireGuard(t *testing.T) { t.Fatalf("Error when setting up test: %v", err) } defer teardownTest(t, data) + skipIfMulticastEnabled(t, data) skipIfEncapModeIsNot(t, data, config.TrafficEncapModeEncap) for _, node := range clusterInfo.nodes { skipIfMissingKernelModule(t, data, node.name, []string{"wireguard"}) } var previousTrafficEncryptionMode string - var previousMulticastEnabledState bool ac := func(config *agentconfig.AgentConfig) { previousTrafficEncryptionMode = config.TrafficEncryptionMode config.TrafficEncryptionMode = "wireguard" - previousMulticastEnabledState = config.Multicast.Enable - config.Multicast.Enable = false } if err := data.mutateAntreaConfigMap(nil, ac, false, true); err != nil { t.Fatalf("Failed to enable WireGuard tunnel: %v", err) @@ -58,7 +56,6 @@ func TestWireGuard(t *testing.T) { defer func() { ac := func(config *agentconfig.AgentConfig) { config.TrafficEncryptionMode = previousTrafficEncryptionMode - config.Multicast.Enable = previousMulticastEnabledState } if err := data.mutateAntreaConfigMap(nil, ac, false, true); err != nil { t.Errorf("Failed to disable WireGuard tunnel: %v", err)