Skip to content

USHIFT-7583: Improve additional rebase scripts runner - #7567

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
pmtk:improve_rebase_scripts_runner
Oct 27, 2026
Merged

openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
pmtk:improve_rebase_scripts_runner

Conversation

@pmtk

@pmtk pmtk commented Oct 20, 2026 •

Copy link
Copy Markdown
Member

Summary by CodeRabbit

  • Refactor
    • Standardized automated rebase script execution and result reporting.
    • Improved logging of script status, runtime, and combined output.
    • Consolidated failure reporting across configured rebase tasks.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Pipeline controller notification

This PR uses the pipeline controller for second-stage tests. Selection and triggering follow the repository configuration.

Use /test ? to list jobs and /pipeline help for commands.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 20, 2026
@openshift-ci-robot

openshift-ci-robot commented Oct 20, 2026 •

Copy link
Copy Markdown

@pmtk: This pull request references USHIFT-7583 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "5.1.0" version, but no target version was set.

Details

In response to this:

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.

@coderabbitai

coderabbitai Bot commented Oct 20, 2026 •

Copy link
Copy Markdown
Contributor

Important

Review skipped

We couldn't safely recover the incremental review. No full review was started, and the last reviewed checkpoint was preserved. Retry later, or explicitly request a full review by commenting @coderabbitai full review.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

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: a98fe249-da89-46eb-9823-2d2c3bd75e50
📥 Commits

Reviewing files that changed from the base of the PR and between c86f3c8 and 9b6ffed.

📒 Files selected for processing: 1
  • scripts/auto-rebase/rebase.py

Included review availability: This review used your included allowance. Your plan provides up to 12 included reviews per hour; 11 remain after this review.

Walkthrough

The rebase script runner now uses RebaseScript and RebaseScriptResult dataclasses. main() runs the configured scripts uniformly, aggregates their success status, and labels failure output with script names.

Changes

Rebase script runner

Layer / File(s) Summary
Shared runner and result types
scripts/auto-rebase/rebase.py
RebaseScriptResult now includes the script name, success status, and output. RebaseScript.run() builds arguments, sets NO_BRANCH=true when configured, captures output, logs status and duration, and returns the result. The four duplicated runner functions were removed.
Main execution and failure logs
scripts/auto-rebase/rebase.py
main() configures and runs the four scripts through RebaseScript, aggregates success, and labels captured failure output with each script name.

Priority: ⬇️ Low

Estimated code review effort: 2 (Simple) | ~10 minutes

Change: Refactor

Suggested reviewers: pacevedom

Merge Risk: ⚪ Minimal · up to 9b6ff

No actionable merge-blocking issue was established. The scripts retain their execution and failure-reporting behavior.

Pre-merge checks: Passed 15
Check name Status Explanation
Description Check Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check Passed The title clearly and concisely describes the main change: improving the additional rebase scripts runner.
Docstring Coverage Passed Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 4 functions across 1 files.
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 PASS: The pull request changes only scripts/auto-rebase/rebase.py. The diff adds no Ginkgo test titles, and the changed file contains no It(), Describe(), Context(), or When() calls. The che…
Test Structure And Quality Passed PASS: The pull request changes only scripts/auto-rebase/rebase.py. It adds no Ginkgo tests or It() blocks, so the listed test-structure requirements do not apply.
Microshift Test Compatibility Passed The pull request changes only scripts/auto-rebase/rebase.py. It adds Python dataclasses and refactors shell-script execution. It adds no Ginkgo e2e tests, so MicroShift API or feature compatibility …
Single Node Openshift (Sno) Test Compatibility Passed PASS: The pull request changes only scripts/auto-rebase/rebase.py. It adds Python dataclasses and refactors shell-script execution. It adds no Ginkgo e2e tests, so no SNO multi-node compatibility is…
Topology-Aware Scheduling Compatibility Passed The pull request changes only scripts/auto-rebase/rebase.py. It refactors subprocess execution into RebaseScript and RebaseScriptResult; it does not add or modify deployment manifests, operator …
Ote Binary Stdout Contract Passed PASS. The pull request changes only scripts/auto-rebase/rebase.py. It does not modify an OTE binary, Go suite setup, or any main(), init(), TestMain(), or suite lifecycle code. The OTE stdout …
Ipv6 And Disconnected Network Test Compatibility Passed PASS: The pull request changes only scripts/auto-rebase/rebase.py. It adds no Ginkgo e2e tests and introduces no test networking or external connectivity behavior covered by this check.
No-Weak-Crypto Passed The pull request changes only scripts/auto-rebase/rebase.py and introduces no MD5, SHA1, DES, 3DES, RC4, Blowfish, ECB, custom cryptography, or secret/token comparisons. The changed code only refact…
Container-Privileges Passed The pull request changes only scripts/auto-rebase/rebase.py. It does not add or modify container or Kubernetes manifests, and it introduces none of the checked settings: privileged: true, `hostPID…
No-Sensitive-Data-In-Logs Passed No sensitive-data logging was introduced. RebaseScript.run() logs the script path, release arguments, return code, and combined script output, but the base implementation already logged the same arg…
Full details: Stable And Deterministic Test Names

Explanation

PASS: The pull request changes only scripts/auto-rebase/rebase.py. The diff adds no Ginkgo test titles, and the changed file contains no It(), Describe(), Context(), or When() calls. The check is not applicable.

Full details: Microshift Test Compatibility

Explanation

The pull request changes only scripts/auto-rebase/rebase.py. It adds Python dataclasses and refactors shell-script execution. It adds no Ginkgo e2e tests, so MicroShift API or feature compatibility checks do not apply.

Full details: Single Node Openshift (Sno) Test Compatibility

Explanation

PASS: The pull request changes only scripts/auto-rebase/rebase.py. It adds Python dataclasses and refactors shell-script execution. It adds no Ginkgo e2e tests, so no SNO multi-node compatibility issue applies.

Full details: Topology-Aware Scheduling Compatibility

Explanation

The pull request changes only scripts/auto-rebase/rebase.py. It refactors subprocess execution into RebaseScript and RebaseScriptResult; it does not add or modify deployment manifests, operator code, controllers, replica settings, affinity, topology spread, node selectors, tolerations, or PDBs. The topology-aware scheduling check is not applicable.

Full details: Ote Binary Stdout Contract

Explanation

PASS. The pull request changes only scripts/auto-rebase/rebase.py. It does not modify an OTE binary, Go suite setup, or any main(), init(), TestMain(), or suite lifecycle code. The OTE stdout contract is not applicable.

Full details: No-Weak-Crypto

Explanation

The pull request changes only scripts/auto-rebase/rebase.py and introduces no MD5, SHA1, DES, 3DES, RC4, Blowfish, ECB, custom cryptography, or secret/token comparisons. The changed code only refactors subprocess script execution and result aggregation.

Full details: Container-Privileges

Explanation

The pull request changes only scripts/auto-rebase/rebase.py. It does not add or modify container or Kubernetes manifests, and it introduces none of the checked settings: privileged: true, hostPID, hostNetwork, hostIPC, SYS_ADMIN, root execution, or allowPrivilegeEscalation: true.

Full details: No-Sensitive-Data-In-Logs

Explanation

No sensitive-data logging was introduced. RebaseScript.run() logs the script path, release arguments, return code, and combined script output, but the base implementation already logged the same arguments and combined output in all four runners. The failure artifact also still records only those script outputs. No changed line logs passwords, tokens, API keys, PII, session IDs, or customer data.

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

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

@openshift-ci
openshift-ci Bot requested review from jerpeter1 and pacevedom October 20, 2026 15:18
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 20, 2026
@pmtk
pmtk force-pushed the improve_rebase_scripts_runner branch from 9b6ffed to 3749768 Compare October 21, 2026 08:30
@pmtk
pmtk force-pushed the improve_rebase_scripts_runner branch from 3749768 to 2c128cd Compare October 21, 2026 08:31
@eslutsky

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Oct 26, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aws-tests
/test e2e-aws-tests-arm
/test e2e-aws-tests-bootc-arm-el10
/test e2e-aws-tests-bootc-arm-el9
/test e2e-aws-tests-bootc-el10
/test e2e-aws-tests-bootc-el9

@openshift-ci

openshift-ci Bot commented Oct 26, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eslutsky, pmtk

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

The pull request process is described 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

@pmtk

pmtk commented Oct 27, 2026

Copy link
Copy Markdown
Member Author

/retest-required

@pmtk

pmtk commented Oct 27, 2026

Copy link
Copy Markdown
Member Author

/verified by ci

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Oct 27, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@pmtk: This PR has been marked as verified by ci.

Details

In response to this:

/verified by ci

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-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD d7fe7f1 and 2 for PR HEAD 2c128cd in total

@openshift-ci

openshift-ci Bot commented Oct 27, 2026

Copy link
Copy Markdown
Contributor

@pmtk: all tests passed!

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.

@openshift-merge-bot
openshift-merge-bot Bot merged commit 100b080 into openshift:main Oct 27, 2026
15 checks passed
@pmtk

pmtk commented Oct 28, 2026

Copy link
Copy Markdown
Member Author

/cherrypick release-5.0

@openshift-cherrypick-robot

Copy link
Copy Markdown

@pmtk: new pull request created: #7615

Details

In response to this:

/cherrypick release-5.0

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

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants