Add timeout to metrics query and cleanup job failure logs in e2e test #3378

sebsoto · 2025-09-30T15:16:36Z

Addresses a missing timeout and improves job error output.

openshift-ci · 2025-09-30T15:17:57Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sebsoto

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [sebsoto]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

jrvaldes · 2025-09-30T15:25:42Z

/retitle Add timeout to metrics query and cleanup job failure logs in e2e test

mansikulkarni96 · 2025-09-30T15:28:57Z

changes lgtm, will cherry-pick this and wait for test results.

jrvaldes

Mostly LGTM, PTAL at the comments

jrvaldes · 2025-09-30T15:27:19Z

test/e2e/metrics_test.go

 		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
 	}
-	client := &http.Client{Transport: tr}
+	client := &http.Client{Transport: tr, Timeout: 30 * time.Second}


30s may be too much for this request, consider 5s

I would rather wait a bit longer than needed than too little to help flakes.
I know vSphere has historically had a very slow network

the idea in the client is to fail fast, it will get retried in the wrapper

https://github.com/openshift/windows-machine-config-operator/pull/3378/files#diff-41354c8d32cc5449ea0e5de5e5f28928103f9d2642b034f4b6e8474d487d656fR244

as a compromise i'll do 15 seconds 👍

jrvaldes · 2025-09-30T15:28:16Z

test/e2e/metrics_test.go

 	}
 	req.Header.Set("Authorization", "Bearer "+token)
 	tr := &http.Transport{
 		// InsecureSkipVerify is required to avoid errors due to bad certificate


consider usign context.WithTimeout to control the timeout per request in ef239e2#diff-41354c8d32cc5449ea0e5de5e5f28928103f9d2642b034f4b6e8474d487d656fL261

for example:

ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() req, err := http.NewRequestWithContext(ctx, "GET", url, nil)

Don't know if that really helps here, theres only one request at the moment, and I can't think of a reason of we would need to tweak individual timeouts for different requests in the case we need to add another.

Makes sense, disregard.

Prevents client.Do from blocking indefinitely.

When a job fails a wall of text is dumped in the test job logs, including the full job spec as well as all events associated with it. This hasn't proven to be useful for debugging, and makes the errors harder to read. All of this information can be found elsewhere in the artifact directory.

jrvaldes · 2025-09-30T17:51:54Z

/lgtm

openshift-ci-robot · 2025-09-30T21:12:54Z

/retest-required

Remaining retests: 0 against base HEAD db80e2a and 2 for PR HEAD 92ec5dc in total

openshift-ci-robot · 2025-09-30T22:12:42Z

/retest-required

Remaining retests: 0 against base HEAD e729729 and 1 for PR HEAD 92ec5dc in total

openshift-ci-robot · 2025-10-01T01:12:59Z

/retest-required

Remaining retests: 0 against base HEAD 6b6ff1b and 0 for PR HEAD 92ec5dc in total

openshift-ci-robot · 2025-10-01T06:12:45Z

/hold

Revision 92ec5dc was retested 3 times: holding

jrvaldes · 2025-10-01T12:17:46Z

/test gcp-e2e-operator

jrvaldes · 2025-10-01T12:17:55Z

/hold cancel

jrvaldes · 2025-10-01T12:22:49Z

/retest-required

openshift-ci-robot · 2025-10-01T14:13:39Z

/retest-required

Remaining retests: 0 against base HEAD 6b6ff1b and 2 for PR HEAD 92ec5dc in total

mansikulkarni96 · 2025-10-01T17:07:21Z

/override ci/prow/nutanix-e2e-operator

openshift-ci · 2025-10-01T17:08:07Z

@mansikulkarni96: Overrode contexts on behalf of mansikulkarni96: ci/prow/nutanix-e2e-operator

In response to this:

/override ci/prow/nutanix-e2e-operator

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

openshift-ci · 2025-10-01T17:08:10Z

@sebsoto: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

mansikulkarni96 · 2025-10-01T17:15:15Z

/cherry-pick release-4.20

openshift-cherrypick-robot · 2025-10-01T17:16:01Z

@mansikulkarni96: new pull request created: #3389

In response to this:

/cherry-pick release-4.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

mansikulkarni96 · 2025-10-01T17:20:05Z

/cherry-pick release-4.19 release-4.18 release-4.17

openshift-cherrypick-robot · 2025-10-01T17:20:48Z

@mansikulkarni96: new pull request created: #3390

In response to this:

/cherry-pick release-4.19 release-4.18 release-4.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

mansikulkarni96 · 2025-10-01T17:22:00Z

/cherry-pick release-4.18
/cherry-pick release-4.17

openshift-cherrypick-robot · 2025-10-01T17:22:40Z

@mansikulkarni96: #3378 failed to apply on top of branch "release-4.17":

Applying: Add timeout to metrics query
Applying: Cleanup job failure logs
Using index info to reconstruct a base tree...
M	test/e2e/network_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/network_test.go
CONFLICT (content): Merge conflict in test/e2e/network_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 Cleanup job failure logs

In response to this:

/cherry-pick release-4.18
/cherry-pick release-4.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

openshift-ci bot requested review from jrvaldes and mansikulkarni96 September 30, 2025 15:17

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 30, 2025

openshift-ci bot changed the title ~~e2e improvements~~ Add timeout to metrics query and cleanup job failure logs in e2e test Sep 30, 2025

jrvaldes reviewed Sep 30, 2025

View reviewed changes

sebsoto added 2 commits September 30, 2025 13:48

[test] Add timeout to metrics query

aa9e9a4

Prevents client.Do from blocking indefinitely.

sebsoto force-pushed the clientTimeoutTest branch from d8ecbcf to 92ec5dc Compare September 30, 2025 17:50

openshift-ci bot assigned jrvaldes Sep 30, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 30, 2025

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 1, 2025

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 1, 2025

openshift-merge-bot bot merged commit e32582b into openshift:master Oct 1, 2025
18 checks passed

openshift-cherrypick-robot mentioned this pull request Oct 1, 2025

[release-4.20] Add timeout to metrics query and cleanup job failure logs in e2e test #3389

Open

openshift-cherrypick-robot mentioned this pull request Oct 1, 2025

[release-4.19] Add timeout to metrics query and cleanup job failure logs in e2e test #3390

Open

Add timeout to metrics query and cleanup job failure logs in e2e test #3378

Add timeout to metrics query and cleanup job failure logs in e2e test #3378

Uh oh!

Conversation

sebsoto commented Sep 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Sep 30, 2025

Uh oh!

jrvaldes commented Sep 30, 2025

Uh oh!

mansikulkarni96 commented Sep 30, 2025

Uh oh!

jrvaldes left a comment

Choose a reason for hiding this comment

Uh oh!

jrvaldes Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

sebsoto Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

jrvaldes Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

sebsoto Sep 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jrvaldes Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

jrvaldes Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

sebsoto Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

jrvaldes Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

jrvaldes commented Sep 30, 2025

Uh oh!

openshift-ci-robot commented Sep 30, 2025

Uh oh!

openshift-ci-robot commented Sep 30, 2025

Uh oh!

openshift-ci-robot commented Oct 1, 2025

Uh oh!

openshift-ci-robot commented Oct 1, 2025

Uh oh!

jrvaldes commented Oct 1, 2025

Uh oh!

jrvaldes commented Oct 1, 2025

Uh oh!

jrvaldes commented Oct 1, 2025

Uh oh!

openshift-ci-robot commented Oct 1, 2025

Uh oh!

mansikulkarni96 commented Oct 1, 2025

Uh oh!

openshift-ci bot commented Oct 1, 2025

Uh oh!

openshift-ci bot commented Oct 1, 2025

Uh oh!

Uh oh!

mansikulkarni96 commented Oct 1, 2025

Uh oh!

openshift-cherrypick-robot commented Oct 1, 2025

Uh oh!

mansikulkarni96 commented Oct 1, 2025

Uh oh!

openshift-cherrypick-robot commented Oct 1, 2025

Uh oh!

mansikulkarni96 commented Oct 1, 2025

Uh oh!

openshift-cherrypick-robot commented Oct 1, 2025

Uh oh!

Reviewers

Assignees

sebsoto commented Sep 30, 2025 •

edited

Loading

sebsoto Sep 30, 2025 •

edited

Loading