diff --git a/test/extended/idling/idling.go b/test/extended/idling/idling.go index eee187cf759e..068d362460fa 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), ) @@ -117,7 +117,7 @@ func createFixture(oc *exutil.CLI, path string) ([]string, []string, error) { return resources, names, nil } -func checkSingleIdle(oc *exutil.CLI, idlingFile string, resources map[string][]string, resourceName string, kind string) { +func checkSingleIdle(oc *exutil.CLI, idlingFile string, resources map[string][]string, resourceName, kind, group string) { g.By("Idling the service") _, err := oc.Run("idle").Args("--resource-names-file", idlingFile).Output() o.Expect(err).ToNot(o.HaveOccurred()) @@ -152,8 +152,9 @@ func checkSingleIdle(oc *exutil.CLI, idlingFile string, resources map[string][]s { Replicas: 2, CrossGroupObjectReference: unidlingapi.CrossGroupObjectReference{ - Name: resources[resourceName][0], - Kind: kind, + Name: resources[resourceName][0], + Kind: kind, + Group: group, }, }, })) @@ -223,7 +224,7 @@ var _ = g.Describe("[sig-network-edge][Feature:Idling]", func() { }) g.It("should idle the service and DeploymentConfig properly [apigroup:apps.openshift.io]", func() { - checkSingleIdle(oc, idlingFile, resources, "deploymentconfig.apps.openshift.io", "DeploymentConfig") + checkSingleIdle(oc, idlingFile, resources, "deploymentconfig.apps.openshift.io", "DeploymentConfig", "apps.openshift.io") }) }) @@ -234,7 +235,7 @@ var _ = g.Describe("[sig-network-edge][Feature:Idling]", func() { }) g.It("should idle the service and ReplicationController properly", func() { - checkSingleIdle(oc, idlingFile, resources, "replicationcontroller", "ReplicationController") + checkSingleIdle(oc, idlingFile, resources, "replicationcontroller", "ReplicationController", "") }) }) }) diff --git a/test/extended/util/annotate/generated/zz_generated.annotations.go b/test/extended/util/annotate/generated/zz_generated.annotations.go index 8204cc896b91..5a097898388a 100644 --- a/test/extended/util/annotate/generated/zz_generated.annotations.go +++ b/test/extended/util/annotate/generated/zz_generated.annotations.go @@ -1973,13 +1973,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 [apigroup:apps.openshift.io][apigroup:route.openshift.io] 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 [apigroup:apps.openshift.io][apigroup:route.openshift.io] should handle many TCP connections by possibly dropping those over a certain bound [Serial]": " [Suite:openshift/conformance/serial]", "[sig-network-edge][Feature:Idling] Unidling [apigroup:apps.openshift.io][apigroup:route.openshift.io] 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 [apigroup:apps.openshift.io][apigroup:route.openshift.io] should work with TCP (when fully idled)": " [Skipped:Network/OVNKubernetes] [Suite:openshift/conformance/parallel]", + "[sig-network-edge][Feature:Idling] Unidling [apigroup:apps.openshift.io][apigroup:route.openshift.io] should work with TCP (when fully idled)": " [Suite:openshift/conformance/parallel]", - "[sig-network-edge][Feature:Idling] Unidling [apigroup:apps.openshift.io][apigroup:route.openshift.io] should work with TCP (while idling)": " [Disabled:Broken] [Skipped:Network/OVNKubernetes]", + "[sig-network-edge][Feature:Idling] Unidling [apigroup:apps.openshift.io][apigroup:route.openshift.io] should work with TCP (while idling)": " [Disabled:Broken]", "[sig-network-edge][Feature:Idling] Unidling [apigroup:apps.openshift.io][apigroup:route.openshift.io] 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 8dda7c06d2b5..1727a110570e 100644 --- a/test/extended/util/annotate/rules.go +++ b/test/extended/util/annotate/rules.go @@ -307,10 +307,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 \[apigroup:apps.openshift.io\]\[apigroup:route.openshift.io\] should work with TCP`, - `Unidling \[apigroup:apps.openshift.io\]\[apigroup:route.openshift.io\] should handle many TCP connections`, }, "[Skipped:ibmroks]": { // skip Gluster tests (not supported on ROKS worker nodes)