Skip to content

Commit a6abded

Browse files
p0lyn0mialbertinatto
authored andcommittedApr 3, 2025
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 12461db commit a6abded

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed
 

Diff for: ‎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>

Diff for: ‎test/e2e/framework/network/utils.go

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

1037-
framework.Logf("Poking %q", url)
1038-
10391037
resp, err := httpGetNoConnectionPoolTimeout(url, params.Timeout)
10401038
if err != nil {
10411039
ret.Error = err
@@ -1087,7 +1085,8 @@ func PokeHTTP(host string, port int, path string, params *HTTPPokeParams) HTTPPo
10871085
}
10881086

10891087
ret.Status = HTTPSuccess
1090-
framework.Logf("Poke(%q): success", url)
1088+
// causes excessive logging that provides no value
1089+
// framework.Logf("Poke(%q): success", url)
10911090
return ret
10921091
}
10931092

Diff for: ‎test/e2e/framework/util.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ func countEndpointsSlicesNum(epList *discoveryv1.EndpointSliceList) int {
450450

451451
// restclientConfig returns a config holds the information needed to build connection to kubernetes clusters.
452452
func restclientConfig(kubeContext string) (*clientcmdapi.Config, error) {
453-
Logf(">>> kubeConfig: %s", TestContext.KubeConfig)
453+
//Logf(">>> kubeConfig: %s", TestContext.KubeConfig)
454454
if TestContext.KubeConfig == "" {
455455
return nil, fmt.Errorf("KubeConfig must be specified to load client config")
456456
}
@@ -459,7 +459,7 @@ func restclientConfig(kubeContext string) (*clientcmdapi.Config, error) {
459459
return nil, fmt.Errorf("error loading KubeConfig: %v", err.Error())
460460
}
461461
if kubeContext != "" {
462-
Logf(">>> kubeContext: %s", kubeContext)
462+
//Logf(">>> kubeContext: %s", kubeContext)
463463
c.CurrentContext = kubeContext
464464
}
465465
return c, nil

0 commit comments

Comments
 (0)