From 09cebd7c1f9998b81bdfe005e6775d0144340459 Mon Sep 17 00:00:00 2001 From: Ori Braunshtein Date: Tue, 7 Jun 2022 16:21:01 +0300 Subject: [PATCH 1/2] Update tryEchoHTTP curl cmd Curling a service with no endpoints has different results: openshift-sdn "hangs" while ovn-k rejects immediately. Because ovk-k refuses the connection curl's retry mechanism doesn't trigger unless --retry-connrefused is specified. Adding it allows the initial curl(s) to fail until the endpoints actually come back from unidling. Signed-off-by: Ori Braunshtein --- test/extended/idling/idling.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/extended/idling/idling.go b/test/extended/idling/idling.go index 937d49eead6d..14b64a99dc4e 100644 --- a/test/extended/idling/idling.go +++ b/test/extended/idling/idling.go @@ -75,7 +75,7 @@ func tryEchoHTTP(svc *kapiv1.Service, execPod *kapiv1.Pod) error { } expected := "It is time to TCP." - cmd := fmt.Sprintf("curl --max-time 120 -s -g http://%s/echo?msg=%s", + cmd := fmt.Sprintf("curl --retry-max-time 120 --retry-connrefused --retry 20 --max-time 5 -s -g http://%s/echo?msg=%s", net.JoinHostPort(rawIP, tcpPort), url.QueryEscape(expected), ) From 07dd7ff25f1f76c2c64702fa29291536fec5a4c5 Mon Sep 17 00:00:00 2001 From: Ori Braunshtein Date: Tue, 7 Jun 2022 16:29:58 +0300 Subject: [PATCH 2/2] Enable unidling tests for ovn-k Signed-off-by: Ori Braunshtein --- .../util/annotate/generated/zz_generated.annotations.go | 6 +++--- test/extended/util/annotate/rules.go | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/test/extended/util/annotate/generated/zz_generated.annotations.go b/test/extended/util/annotate/generated/zz_generated.annotations.go index 2872345788b1..bf666c68fcb5 100644 --- a/test/extended/util/annotate/generated/zz_generated.annotations.go +++ b/test/extended/util/annotate/generated/zz_generated.annotations.go @@ -2239,13 +2239,13 @@ var Annotations = map[string]string{ "[sig-network-edge][Feature:Idling] Idling with a single service and ReplicationController should idle the service and ReplicationController properly": " [Suite:openshift/conformance/parallel]", - "[sig-network-edge][Feature:Idling] Unidling should handle many TCP connections by possibly dropping those over a certain bound [Serial]": " [Skipped:Network/OVNKubernetes] [Suite:openshift/conformance/serial]", + "[sig-network-edge][Feature:Idling] Unidling should handle many TCP connections by possibly dropping those over a certain bound [Serial]": " [Suite:openshift/conformance/serial]", "[sig-network-edge][Feature:Idling] Unidling should handle many UDP senders (by continuing to drop all packets on the floor) [Serial]": " [Suite:openshift/conformance/serial]", - "[sig-network-edge][Feature:Idling] Unidling should work with TCP (when fully idled)": " [Skipped:Network/OVNKubernetes] [Suite:openshift/conformance/parallel]", + "[sig-network-edge][Feature:Idling] Unidling should work with TCP (when fully idled)": " [Suite:openshift/conformance/parallel]", - "[sig-network-edge][Feature:Idling] Unidling should work with TCP (while idling)": " [Disabled:Broken] [Skipped:Network/OVNKubernetes]", + "[sig-network-edge][Feature:Idling] Unidling should work with TCP (while idling)": " [Suite:openshift/conformance/parallel]", "[sig-network-edge][Feature:Idling] Unidling should work with UDP": " [Suite:openshift/conformance/parallel]", diff --git a/test/extended/util/annotate/rules.go b/test/extended/util/annotate/rules.go index c765e10f93eb..76d185a2724a 100644 --- a/test/extended/util/annotate/rules.go +++ b/test/extended/util/annotate/rules.go @@ -64,9 +64,6 @@ var ( // https://bugzilla.redhat.com/show_bug.cgi?id=1996128 `\[sig-network\] \[Feature:IPv6DualStack\] should have ipv4 and ipv6 node podCIDRs`, - // https://bugzilla.redhat.com/show_bug.cgi?id=2004074 - `\[sig-network-edge\]\[Feature:Idling\] Unidling should work with TCP \(while idling\)`, - // https://bugzilla.redhat.com/show_bug.cgi?id=2070929 `\[sig-network\]\[Feature:EgressIP\]\[apigroup:config.openshift.io\] \[internal-targets\]`, @@ -302,10 +299,6 @@ var ( // ovn-kubernetes does not support named ports `NetworkPolicy.*named port`, - - // https://bugzilla.redhat.com/show_bug.cgi?id=1989169: unidling tests are flaky under ovn-kubernetes - `Unidling should work with TCP`, - `Unidling should handle many TCP connections`, }, "[Skipped:ibmroks]": { // skip Gluster tests (not supported on ROKS worker nodes)