Skip to content

OCPBUGSM-35025: reenable unidling ci tests #27538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Nov 11, 2022
Merged

OCPBUGSM-35025: reenable unidling ci tests #27538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions test/extended/idling/idling.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
)
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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,
},
},
}))
Expand Down Expand Up @@ -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")
})
})

Expand All @@ -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", "")
})
})
})
Expand Down
6 changes: 3 additions & 3 deletions test/extended/util/annotate/generated/zz_generated.annotations.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions test/extended/util/annotate/rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down