Skip to content

OCPBUGS-92035: Allow to customize internal hardcoded timeouts - #81028

Open
pawanpinjarkar wants to merge 1 commit into
openshift:mainfrom
pawanpinjarkar:fix-timeout
Open

OCPBUGS-92035: Allow to customize internal hardcoded timeouts#81028
pawanpinjarkar wants to merge 1 commit into
openshift:mainfrom
pawanpinjarkar:fix-timeout

Conversation

@pawanpinjarkar

@pawanpinjarkar pawanpinjarkar commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

The existing timeouts are hardcoded to arbitrary values, making it impossible to adjust them for specific jobs or use cases. This PR introduces two new environment variables to allow customization:

  • DEVSCRIPTS_TARGET_TIMEOUT: Configures the timeout for the dev-scripts target being executed
  • DEVSCRIPTS_TIMEOUT: Configures the timeout for overall dev-scripts setup command execution

Both variables fall back to their historical default values when not defined, ensuring backward compatibility.

Summary by CodeRabbit

This change makes two dev-scripts timeouts configurable through CI environment variables instead of being fixed in the setup scripts. In practice, OpenShift CI jobs that run these dev-scripts flows can now tune both the overall setup duration and the timeout for the target step without editing the scripts themselves.

It updates the baremetalds devscripts setup flow to:

  • read DEVSCRIPTS_TIMEOUT for the main ssh ... bash execution timeout
  • read DEVSCRIPTS_TARGET_TIMEOUT for the make ${DEVSCRIPTS_TARGET} timeout
  • document and expose both variables in the corresponding workflow/config

The agent E2E conformance workflow also sets a longer target timeout for the agent dev-scripts target, which helps accommodate longer-running execution in that CI path.

Backward compatibility is preserved by keeping the existing default timeout values when the variables are not provided.

@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jun 24, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@pawanpinjarkar: This pull request references Jira Issue OCPBUGS-92035, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (5.0.0) matches configured target version for branch (5.0.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

The existing timeouts are hardcoded to arbitrary values, making it impossible to adjust them for specific jobs or use cases. This PR introduces two new environment variables to allow customization:

  • DEVSCRIPTS_TARGET_TIMEOUT: Configures the timeout for the dev-scripts target being executed
  • DEVSCRIPTS_TIMEOUT: Configures the timeout for overall dev-scripts setup command execution

Both variables fall back to their historical default values when not defined, ensuring backward compatibility.

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 openshift-eng/jira-lifecycle-plugin repository.

@pawanpinjarkar

Copy link
Copy Markdown
Contributor Author

/cc @bfournie @andfasano @sadasu

@openshift-ci
openshift-ci Bot requested review from andfasano, bfournie and sadasu June 24, 2026 18:14
@coderabbitai

coderabbitai Bot commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 9acc8138-46e6-4313-b509-b9d637812be8

📥 Commits

Reviewing files that changed from the base of the PR and between 695d62e and e748ede.

📒 Files selected for processing (3)
  • ci-operator/step-registry/agent/e2e/generic/conformance/iso-no-registry/agent-e2e-generic-conformance-iso-no-registry-workflow.yaml
  • ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh
  • ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-ref.yaml

Walkthrough

Hard-coded timeout values (175m and 130m) in the baremetalds devscripts setup script are replaced with environment variables DEVSCRIPTS_TIMEOUT and DEVSCRIPTS_TARGET_TIMEOUT (with the same values as defaults). Both variables are declared in the step ref YAML. The agent conformance workflow sets DEVSCRIPTS_TARGET_TIMEOUT to 180m.

Changes

Devscripts Timeout Parameterization

Layer / File(s) Summary
Parameterize timeouts in script and ref config
ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh, ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-ref.yaml
The script replaces the fixed 175m and 130m timeout literals with ${DEVSCRIPTS_TIMEOUT:-175m} and ${DEVSCRIPTS_TARGET_TIMEOUT:-130m}. The ref YAML declares both variables with empty defaults and documentation strings.
Override target timeout in agent conformance workflow
ci-operator/step-registry/agent/e2e/generic/conformance/iso-no-registry/agent-e2e-generic-conformance-iso-no-registry-workflow.yaml
Adds DEVSCRIPTS_TARGET_TIMEOUT: 180m to the workflow env block, raising the target step timeout above the 130m default for this specific workflow.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly matches the main change: making previously hardcoded timeouts configurable via environment variables.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed No Ginkgo test titles were added or modified; the PR only changes YAML/bash timeout config, so the check is not applicable.
Test Structure And Quality ✅ Passed No Ginkgo tests were changed; the PR only edits CI workflow YAML and shell scripts, so this test-quality check is not applicable.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; the PR only parameterizes timeouts in workflow/shell/YAML, so no MicroShift-incompatible APIs are introduced.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No Ginkgo e2e tests were added; changes only adjust dev-scripts timeout env vars in YAML/shell, so SNO compatibility is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed Only dev-scripts timeout env vars were added/parameterized; no scheduling constraints, node selectors, affinity, or replica logic changed.
Ote Binary Stdout Contract ✅ Passed PASS: The PR only parameterizes timeout env vars in YAML/shell scripts; no new process-level stdout writes or logging changes were introduced.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No new Ginkgo tests or external connectivity were added; changes only parameterize dev-scripts timeouts in workflow/scripts.
No-Weak-Crypto ✅ Passed The PR only adds timeout env vars/docs and a timeout wrapper; no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB, custom crypto, or secret comparisons appear.
Container-Privileges ✅ Passed No privileged, hostPID/Network/IPC, SYS_ADMIN, or allowPrivilegeEscalation settings were added in the changed workflow or devscripts files.
No-Sensitive-Data-In-Logs ✅ Passed The PR only adds timeout env vars and docs; no new logging of secrets, PII, or host data was introduced.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@pawanpinjarkar: This pull request references Jira Issue OCPBUGS-92035, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (5.0.0) matches configured target version for branch (5.0.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
Details

In response to this:

The existing timeouts are hardcoded to arbitrary values, making it impossible to adjust them for specific jobs or use cases. This PR introduces two new environment variables to allow customization:

  • DEVSCRIPTS_TARGET_TIMEOUT: Configures the timeout for the dev-scripts target being executed
  • DEVSCRIPTS_TIMEOUT: Configures the timeout for overall dev-scripts setup command execution

Both variables fall back to their historical default values when not defined, ensuring backward compatibility.

Summary by CodeRabbit

This change makes two dev-scripts timeouts configurable through CI environment variables instead of being fixed in the setup scripts. In practice, OpenShift CI jobs that run these dev-scripts flows can now tune both the overall setup duration and the timeout for the target step without editing the scripts themselves.

It updates the baremetalds devscripts setup flow to:

  • read DEVSCRIPTS_TIMEOUT for the main ssh ... bash execution timeout
  • read DEVSCRIPTS_TARGET_TIMEOUT for the make ${DEVSCRIPTS_TARGET} timeout
  • document and expose both variables in the corresponding workflow/config

The agent E2E conformance workflow also sets a longer target timeout for the agent dev-scripts target, which helps accommodate longer-running execution in that CI path.

Backward compatibility is preserved by keeping the existing default timeout values when the variables are not provided.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci

openshift-ci Bot commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: pawanpinjarkar
Once this PR has been reviewed and has the lgtm label, please assign andfasano for approval. For more information see the Code Review Process.

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

Details Needs approval from an approver in each of these files:

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

@openshift-ci
openshift-ci Bot requested review from smg247 and sosiouxme June 24, 2026 18:16
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@pawanpinjarkar: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-assisted-service-master-e2e-agent-compact-ipv4 openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-5.1-e2e-agent-compact-ipv4 openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-5.0-e2e-agent-compact-ipv4 openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-4.23-e2e-agent-compact-ipv4 openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-4.22-e2e-agent-compact-ipv4 openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-4.21-e2e-agent-compact-ipv4 openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-4.20-e2e-agent-compact-ipv4 openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-4.19-e2e-agent-compact-ipv4 openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-4.18-e2e-agent-compact-ipv4 openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-4.17-e2e-agent-compact-ipv4 openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-4.16-e2e-agent-compact-ipv4 openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-4.15-e2e-agent-compact-ipv4 openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-4.14-e2e-agent-compact-ipv4 openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-4.13-e2e-agent-compact-ipv4 openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-4.12-e2e-agent-compact-ipv4 openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-master-e2e-agent-compact-ipv4-iso-no-registry openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-5.1-e2e-agent-compact-ipv4-iso-no-registry openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-5.0-e2e-agent-compact-ipv4-iso-no-registry openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-4.23-e2e-agent-compact-ipv4-iso-no-registry openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-4.22-e2e-agent-compact-ipv4-iso-no-registry openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-4.21-e2e-agent-compact-ipv4-iso-no-registry openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-master-e2e-agent-ha-dualstack openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-master-e2e-agent-4control-ipv4 openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-master-e2e-agent-5control-ipv4 openshift/assisted-service presubmit Registry content changed
pull-ci-openshift-assisted-service-release-5.1-e2e-agent-ha-dualstack openshift/assisted-service presubmit Registry content changed

A total of 4380 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here
Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@pawanpinjarkar

Copy link
Copy Markdown
Contributor Author

/pj-rehearse auto-ack

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@pawanpinjarkar: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-ci

openshift-ci Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

@pawanpinjarkar: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/rehearse/openshift-assisted/assisted-installer-ui/release-5.1/e2e-agent-compact-ipv4-iso-no-registry e748ede link unknown /pj-rehearse pull-ci-openshift-assisted-assisted-installer-ui-release-5.1-e2e-agent-compact-ipv4-iso-no-registry
ci/rehearse/openshift-assisted/assisted-installer-ui/release-4.22/e2e-agent-compact-ipv4-iso-no-registry e748ede link unknown /pj-rehearse pull-ci-openshift-assisted-assisted-installer-ui-release-4.22-e2e-agent-compact-ipv4-iso-no-registry

Full PR test history. Your PR dashboard.

Details

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.

@bfournie

bfournie commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

This has been addressed in #82635.

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 4, 2026
@openshift-ci

openshift-ci Bot commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

PR needs rebase.

Details

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants