Skip to content

USHIFT-6865: Fix rebase blocked branch logic #6548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Apr 21, 2026
Merged

USHIFT-6865: Fix rebase blocked branch logic #6548

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions scripts/pyutils/ghutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ def is_branch_under_active_development(self, branch):
Checks title of the issue #1239 in the openshift/microshift repository to check if
given branch is frozen and thus under active development is happening on main branch.

It returns True if given branch is the first on the list of frozen branches.
In such case the target (base) branch of newly created PR should be switch to main.
It returns True if given branch is on the list of frozen branches.
In such case the target (base) branch of newly created PR should be switched to main.
"""
if self.dry_run:
logging.info(f"[DRY RUN] Assuming branch {branch} is under active development")
Expand All @@ -68,9 +68,7 @@ def is_branch_under_active_development(self, branch):
frozen_branches = [x.replace('branch:', '') for x in branches_part.split()]
if len(frozen_branches) == 0:
raise Exception(f"Unexpected amount of branch in the Issue 1239 title: {title}")
# Assuming the first branch name is the release under development right now.
# No job creating PRs should run against the next release branch.
return branch == frozen_branches[0]
return branch in frozen_branches
except Exception as e:
raise RuntimeError(f"Failed to parse freeze issue title: {title} ({e})")

Expand Down