Skip to content
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

Jump to bottom

USHIFT-2478: fix jira script logic to handle closed PRs #3104

Merged
merged 1 commit into from
Mar 6, 2024
Merged

USHIFT-2478: fix jira script logic to handle closed PRs #3104

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 21 additions & 15 deletions scripts/jira/manage_ticket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,25 +264,31 @@ def command_close(args):
points = getter(ticket, 'Story Points')
print(f' Story Points: {points}')

all_merged = True
num_merged = 0
num_closed = 0
links = server.remote_links(ticket.id)
print(f' PRs: {len(links)}')
if not links:
all_merged = False
else:
for link in links:
url = link.object.url
if not is_pr_link(url):
continue
org_name, repo_name, pr_num = parse_pr_link(url)
repo = gh.get_repo(f'{org_name}/{repo_name}')
pr = repo.get_pull(int(pr_num))
print(f' Link: {url} ({pr.merged})')
if not pr.merged:
all_merged = False
for link in links:
url = link.object.url
if not is_pr_link(url):
continue
org_name, repo_name, pr_num = parse_pr_link(url)
repo = gh.get_repo(f'{org_name}/{repo_name}')
pr = repo.get_pull(int(pr_num))
state = pr.state
if pr.merged:
state = 'merged'
print(f' Link: {url} ({state})')
if pr.merged:
num_merged += 1
elif pr.closed_at:
num_closed += 1
# We can close the ticket if we have at least 1 merged PR and
# no open PRs.
is_closable = num_merged and ((num_merged + num_closed) == len(links))

actual_project_id = get_project_id_from_ticket_id(ticket.key)
if actual_project_id == 'OCPBUGS' or not all_merged:
if actual_project_id == 'OCPBUGS' or not is_closable:
print(' Transition: none')
continue

Expand Down