Skip to content

Commit

Permalink
Skip IPSec/WireGuard e2e test when the Multicast feature is enabled
Browse files Browse the repository at this point in the history
This is an e2e fix because of PR antrea-io#5920.

Signed-off-by: Lan Luo <luola@vmware.com>
  • Loading branch information
luolanzone committed Apr 28, 2024
1 parent 5c79f39 commit 1563807
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
10 changes: 10 additions & 0 deletions test/e2e/fixtures.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions test/e2e/ipsec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 1 addition & 4 deletions test/e2e/wireguard_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,25 +40,22 @@ 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)
}
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)
Expand Down

0 comments on commit 1563807

Please sign in to comment.