Skip to content

Commit b63eb4c

Browse files
p0lyn0mialbertinatto
authored andcommitted
UPSTREAM: <carry>: Remove excessive e2e logging
UPSTREAM: <carry>: Remove a redundant output in the tests This line is not necessary for our test usage and should not be an issue in OpenShift (openshift-tests already verifies this correctly). UPSTREAM: <carry>: Remove excessive logging during e2e upgrade test This line makes the upgrade log output unreadable and provides no value during the set of tests it's used in: ``` Jan 12 20:49:25.628: INFO: cluster upgrade is Progressing: Working towards registry.svc.ci.openshift.org/ci-op-jbtg7jjb/release@sha256:144e73d125cce620bdf099be9a85225ade489a95622a70075d264ea3ff79219c: downloading update Jan 12 20:49:26.692: INFO: Poke("http://a74e3476115ce4d2d817a1e5ea608dad-802917831.us-east-1.elb.amazonaws.com:80/echo?msg=hello"): success Jan 12 20:49:28.727: INFO: Poke("http://a74e3476115ce4d2d817a1e5ea608dad-802917831.us-east-1.elb.amazonaws.com:80/echo?msg=hello"): success ``` OpenShift-Rebase-Source: 8e73298
1 parent b04ab3e commit b63eb4c

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

test/e2e/framework/internal/unittests/cleanup/cleanup_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ const (
120120
< Exit [BeforeEach] e2e - cleanup_test.go:63 <time>
121121
> Enter [BeforeEach] e2e - set up framework | framework.go:xxx <time>
122122
STEP: Creating a kubernetes client - framework.go:xxx <time>
123-
<klog> util.go:xxx] >>> kubeConfig: yyy/kube.config
124123
STEP: Building a namespace api object, basename test-namespace - framework.go:xxx <time>
125124
<klog> framework.go:xxx] Skipping waiting for service account
126125
< Exit [BeforeEach] e2e - set up framework | framework.go:xxx <time>

test/e2e/framework/network/utils.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -1027,8 +1027,6 @@ func PokeHTTP(host string, port int, path string, params *HTTPPokeParams) HTTPPo
10271027
params.Timeout = 10 * time.Second
10281028
}
10291029

1030-
framework.Logf("Poking %q", url)
1031-
10321030
resp, err := httpGetNoConnectionPoolTimeout(url, params.Timeout)
10331031
if err != nil {
10341032
ret.Error = err
@@ -1080,7 +1078,8 @@ func PokeHTTP(host string, port int, path string, params *HTTPPokeParams) HTTPPo
10801078
}
10811079

10821080
ret.Status = HTTPSuccess
1083-
framework.Logf("Poke(%q): success", url)
1081+
// causes excessive logging that provides no value
1082+
// framework.Logf("Poke(%q): success", url)
10841083
return ret
10851084
}
10861085

test/e2e/framework/util.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ func countEndpointsSlicesNum(epList *discoveryv1.EndpointSliceList, addressType
499499

500500
// restclientConfig returns a config holds the information needed to build connection to kubernetes clusters.
501501
func restclientConfig(kubeContext string) (*clientcmdapi.Config, error) {
502-
Logf(">>> kubeConfig: %s", TestContext.KubeConfig)
502+
//Logf(">>> kubeConfig: %s", TestContext.KubeConfig)
503503
if TestContext.KubeConfig == "" {
504504
return nil, fmt.Errorf("KubeConfig must be specified to load client config")
505505
}
@@ -508,7 +508,7 @@ func restclientConfig(kubeContext string) (*clientcmdapi.Config, error) {
508508
return nil, fmt.Errorf("error loading KubeConfig: %v", err.Error())
509509
}
510510
if kubeContext != "" {
511-
Logf(">>> kubeContext: %s", kubeContext)
511+
//Logf(">>> kubeContext: %s", kubeContext)
512512
c.CurrentContext = kubeContext
513513
}
514514
return c, nil

0 commit comments

Comments
 (0)