diff --git a/test/e2e/common/network/networking.go b/test/e2e/common/network/networking.go index 3f8d463399a..452707edc78 100644 --- a/test/e2e/common/network/networking.go +++ b/test/e2e/common/network/networking.go @@ -131,14 +131,12 @@ var _ = SIGDescribe("Networking", func() { } }) - // [Disruptive] because it conflicts with tests that call CheckSCTPModuleLoadedOnNodes - ginkgo.It("should function for intra-pod communication: sctp [LinuxOnly][Feature:SCTPConnectivity][Disruptive]", func(ctx context.Context) { + ginkgo.It("should function for intra-pod communication: sctp [LinuxOnly][Feature:SCTPConnectivity]", func(ctx context.Context) { config := e2enetwork.NewNetworkingTestConfig(f, e2enetwork.EnableSCTP) checkPodToPodConnectivity(config, "sctp", e2enetwork.EndpointSCTPPort) }) - // [Disruptive] because it conflicts with tests that call CheckSCTPModuleLoadedOnNodes - ginkgo.It("should function for node-pod communication: sctp [LinuxOnly][Feature:SCTPConnectivity][Disruptive]", func(ctx context.Context) { + ginkgo.It("should function for node-pod communication: sctp [LinuxOnly][Feature:SCTPConnectivity]", func(ctx context.Context) { ginkgo.Skip("Skipping SCTP node to pod test until DialFromNode supports SCTP #96482") config := e2enetwork.NewNetworkingTestConfig(f, e2enetwork.EnableSCTP) for _, endpointPod := range config.EndpointPods { diff --git a/test/e2e/network/dual_stack.go b/test/e2e/network/dual_stack.go index b1ae6c0739c..5d473549396 100644 --- a/test/e2e/network/dual_stack.go +++ b/test/e2e/network/dual_stack.go @@ -462,8 +462,7 @@ var _ = common.SIGDescribe("[Feature:IPv6DualStack]", func() { } }) - // [Disruptive] because it conflicts with tests that call CheckSCTPModuleLoadedOnNodes - ginkgo.It("should function for pod-Service: sctp [Feature:SCTPConnectivity][Disruptive]", func(ctx context.Context) { + ginkgo.It("should function for pod-Service: sctp [Feature:SCTPConnectivity]", func(ctx context.Context) { config := e2enetwork.NewNetworkingTestConfig(f, e2enetwork.EnableDualStack, e2enetwork.EnableSCTP) ginkgo.By(fmt.Sprintf("dialing(sctp) %v --> %v:%v (config.clusterIP)", config.TestContainerPod.Name, config.SecondaryClusterIP, e2enetwork.ClusterSCTPPort)) err := config.DialFromTestContainer("sctp", config.SecondaryClusterIP, e2enetwork.ClusterSCTPPort, config.MaxTries, 0, config.EndpointHostnames()) diff --git a/test/e2e/network/netpol/network_legacy.go b/test/e2e/network/netpol/network_legacy.go index 4875c88476a..6702afb60ab 100644 --- a/test/e2e/network/netpol/network_legacy.go +++ b/test/e2e/network/netpol/network_legacy.go @@ -1686,7 +1686,10 @@ var _ = common.SIGDescribe("NetworkPolicyLegacy [LinuxOnly]", func() { }) cleanupServerPodAndService(f, podA, serviceA) }) - ginkgo.It("should not allow access by TCP when a policy specifies only SCTP [Feature:NetworkPolicy]", func(ctx context.Context) { + + // This is [Serial] because it can't run at the same time as the + // [Feature:SCTPConnectivity] tests, since they may cause sctp.ko to be loaded. + ginkgo.It("should not allow access by TCP when a policy specifies only SCTP [Feature:NetworkPolicy] [Serial]", func(ctx context.Context) { ginkgo.By("getting the state of the sctp module on nodes") nodes, err := e2enode.GetReadySchedulableNodes(f.ClientSet) framework.ExpectNoError(err) @@ -1729,7 +1732,7 @@ var _ = common.SIGDescribe("NetworkPolicyLegacy [LinuxOnly]", func() { }) }) -var _ = common.SIGDescribe("NetworkPolicy [Feature:SCTPConnectivity][LinuxOnly][Disruptive]", func() { +var _ = common.SIGDescribe("NetworkPolicy [Feature:SCTPConnectivity][LinuxOnly]", func() { var service *v1.Service var podServer *v1.Pod var podServerLabelSelector string diff --git a/test/e2e/network/netpol/network_policy.go b/test/e2e/network/netpol/network_policy.go index 05bb2f19113..4cb45cf02bf 100644 --- a/test/e2e/network/netpol/network_policy.go +++ b/test/e2e/network/netpol/network_policy.go @@ -1312,7 +1312,7 @@ var _ = common.SIGDescribe("Netpol [LinuxOnly]", func() { }) }) -var _ = common.SIGDescribe("Netpol [Feature:SCTPConnectivity][LinuxOnly][Disruptive]", func() { +var _ = common.SIGDescribe("Netpol [Feature:SCTPConnectivity][LinuxOnly]", func() { f := framework.NewDefaultFramework("sctp-network-policy") f.SkipNamespaceCreation = true f.NamespacePodSecurityEnforceLevel = admissionapi.LevelBaseline diff --git a/test/e2e/network/networking.go b/test/e2e/network/networking.go index 619adfff266..fac8c030fb7 100644 --- a/test/e2e/network/networking.go +++ b/test/e2e/network/networking.go @@ -176,8 +176,7 @@ var _ = common.SIGDescribe("Networking", func() { } }) - // [Disruptive] because it conflicts with tests that call CheckSCTPModuleLoadedOnNodes - ginkgo.It("should function for pod-Service: sctp [Feature:SCTPConnectivity][Disruptive]", func(ctx context.Context) { + ginkgo.It("should function for pod-Service: sctp [Feature:SCTPConnectivity]", func(ctx context.Context) { config := e2enetwork.NewNetworkingTestConfig(f, e2enetwork.EnableSCTP) ginkgo.By(fmt.Sprintf("dialing(sctp) %v --> %v:%v (config.clusterIP)", config.TestContainerPod.Name, config.ClusterIP, e2enetwork.ClusterSCTPPort)) err := config.DialFromTestContainer("sctp", config.ClusterIP, e2enetwork.ClusterSCTPPort, config.MaxTries, 0, config.EndpointHostnames()) @@ -219,8 +218,7 @@ var _ = common.SIGDescribe("Networking", func() { } }) - // [Disruptive] because it conflicts with tests that call CheckSCTPModuleLoadedOnNodes - ginkgo.It("should function for node-Service: sctp [Feature:SCTPConnectivity][Disruptive]", func(ctx context.Context) { + ginkgo.It("should function for node-Service: sctp [Feature:SCTPConnectivity]", func(ctx context.Context) { ginkgo.Skip("Skipping SCTP node to service test until DialFromNode supports SCTP #96482") config := e2enetwork.NewNetworkingTestConfig(f, e2enetwork.EnableSCTP) ginkgo.By(fmt.Sprintf("dialing(sctp) %v (node) --> %v:%v (config.clusterIP)", config.NodeIP, config.ClusterIP, e2enetwork.ClusterSCTPPort)) @@ -264,8 +262,7 @@ var _ = common.SIGDescribe("Networking", func() { } }) - // [Disruptive] because it conflicts with tests that call CheckSCTPModuleLoadedOnNodes - ginkgo.It("should function for endpoint-Service: sctp [Feature:SCTPConnectivity][Disruptive]", func(ctx context.Context) { + ginkgo.It("should function for endpoint-Service: sctp [Feature:SCTPConnectivity]", func(ctx context.Context) { config := e2enetwork.NewNetworkingTestConfig(f, e2enetwork.EnableSCTP) ginkgo.By(fmt.Sprintf("dialing(sctp) %v (endpoint) --> %v:%v (config.clusterIP)", config.EndpointPods[0].Name, config.ClusterIP, e2enetwork.ClusterSCTPPort)) err := config.DialFromEndpointContainer("sctp", config.ClusterIP, e2enetwork.ClusterSCTPPort, config.MaxTries, 0, config.EndpointHostnames()) @@ -635,7 +632,9 @@ var _ = common.SIGDescribe("Networking", func() { framework.ExpectNoError(err, "kubelet did not recreate its iptables rules") }) - ginkgo.It("should allow creating a Pod with an SCTP HostPort [LinuxOnly]", func(ctx context.Context) { + // This is [Serial] because it can't run at the same time as the + // [Feature:SCTPConnectivity] tests, since they may cause sctp.ko to be loaded. + ginkgo.It("should allow creating a Pod with an SCTP HostPort [LinuxOnly] [Serial]", func(ctx context.Context) { node, err := e2enode.GetRandomReadySchedulableNode(f.ClientSet) framework.ExpectNoError(err) hostExec := utils.NewHostExec(f) diff --git a/test/e2e/network/service.go b/test/e2e/network/service.go index a797bb0f610..fcaf4eebb71 100644 --- a/test/e2e/network/service.go +++ b/test/e2e/network/service.go @@ -3780,7 +3780,9 @@ var _ = common.SIGDescribe("Services", func() { e2epod.DeletePodOrFail(cs, ns, podname1) }) - ginkgo.It("should allow creating a basic SCTP service with pod and endpoints [LinuxOnly]", func(ctx context.Context) { + // These is [Serial] because it can't run at the same time as the + // [Feature:SCTPConnectivity] tests, since they may cause sctp.ko to be loaded. + ginkgo.It("should allow creating a basic SCTP service with pod and endpoints [LinuxOnly] [Serial]", func(ctx context.Context) { serviceName := "sctp-endpoint-test" ns := f.Namespace.Name jig := e2eservice.NewTestJig(cs, ns, serviceName)