Skip to content

USHIFT-6865: Fix rebase blocked branch logic#6548

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
pacevedom:USHIFT-6865
Apr 21, 2026
Merged

USHIFT-6865: Fix rebase blocked branch logic#6548
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
pacevedom:USHIFT-6865

Conversation

@pacevedom

@pacevedom pacevedom commented Apr 21, 2026

Copy link
Copy Markdown
Contributor

Summary by CodeRabbit

  • Bug Fixes
    • Corrected branch development status detection to properly identify all branches in the active development list, rather than checking only the first entry.

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

openshift-ci-robot commented Apr 21, 2026

Copy link
Copy Markdown

@pacevedom: This pull request references USHIFT-6865 which is a valid jira issue.

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 Apr 21, 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: Pro Plus

Run ID: 9ee1902a-7421-4985-aed4-2d8d64b41a36

📥 Commits

Reviewing files that changed from the base of the PR and between d910461 and 6a8fb9b.

📒 Files selected for processing (1)
  • scripts/pyutils/ghutils.py

Walkthrough

Modified GithubUtils.is_branch_under_active_development to check if a branch exists anywhere in the frozen-branches list rather than only matching the first entry. Updated docstring accordingly. All other behavior unchanged.

Changes

Cohort / File(s) Summary
Branch Development Status Check
scripts/pyutils/ghutils.py
Changed branch matching logic from first-entry equality check to membership check across entire frozen-branches list; updated docstring to reflect "on the list" semantics.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

🚥 Pre-merge checks | ✅ 12
✅ Passed checks (12 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly references the specific logic change: fixing the rebase blocked branch detection to check branch membership in the frozen-branches list rather than just the first entry.
Docstring Coverage ✅ Passed Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.
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 PR modifies only scripts/pyutils/ghutils.py, a Python utility file. The check targets Ginkgo test names in Go test files, which this PR does not modify or add.
Test Structure And Quality ✅ Passed Custom check for Ginkgo test structure not applicable; PR modifies only Python utility module without touching Ginkgo test files.
Microshift Test Compatibility ✅ Passed PR modifies only scripts/pyutils/ghutils.py; no new Ginkgo e2e tests added, so custom check does not apply.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR modifies only Python utility file (scripts/pyutils/ghutils.py) for GitHub operations; no new Go Ginkgo e2e tests added, making this check inapplicable.
Topology-Aware Scheduling Compatibility ✅ Passed The PR modifies only a Python utility script for GitHub CI/CD logic, not Kubernetes deployment manifests or scheduling constraints, so this topology-aware check is not applicable.
Ote Binary Stdout Contract ✅ Passed PR modifies only Python utility script; OTE Binary Stdout Contract check applies exclusively to Go test binaries, not Python code.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR modifies Python utility script, not Ginkgo e2e tests. Custom check for IPv6/disconnected network test compatibility is not applicable.

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

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

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@openshift-ci openshift-ci Bot requested review from eslutsky and jogeo April 21, 2026 08:07
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 21, 2026
@pmtk

pmtk commented Apr 21, 2026

Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 21, 2026
@openshift-ci

openshift-ci Bot commented Apr 21, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pacevedom, 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

@openshift-ci

openshift-ci Bot commented Apr 21, 2026

Copy link
Copy Markdown
Contributor

@pacevedom: 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.

@pacevedom

Copy link
Copy Markdown
Contributor Author

/verified by CI

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

Copy link
Copy Markdown

@pacevedom: 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 openshift-merge-bot Bot merged commit 652f9af into openshift:main Apr 21, 2026
13 checks passed
@pacevedom pacevedom deleted the USHIFT-6865 branch April 21, 2026 10:10
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.

3 participants