USHIFT-549 USHIFT-679: Python script for rebase job #1223
Conversation
openshift-ci
bot
added
the
do-not-merge/work-in-progress
openshift-ci
bot
added
the
approved
pmtk
force-pushed
the
rebase-python-wrapper
branch
2 times, most recently
from
45b8824
to
2a1b8d3
Compare
pmtk
changed the title
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
pmtk
force-pushed
the
rebase-python-wrapper
branch
3 times, most recently
from
0cfecc6
to
4ddcaec
Compare
|
/retest |
scripts/auto-rebase/rebase.py
Outdated
| result = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) | ||
| logging.info(f"Output:\n\n{result.stdout}\n------------------------------\n") | ||
| logging.info(f"Script returned code: {result.returncode}") | ||
| rr = namedtuple("RebaseResult", ["success", "output"]) |
There was a problem hiding this comment.
This type really should be defined outside of the function so it's clear it's used elsewhere.
| matching_branches = ", ".join([r.name for r in matching_remote_refs]) | ||
| logging.warning(f"Found more than one branch matching '{branch_name}' on remote: {matching_branches}. Taking first one") | ||
| _extra_msgs.append(f"Found more than one branch matching '{branch_name}' on remote: {matching_branches}.") | ||
| return matching_remote_refs[0] |
There was a problem hiding this comment.
Are the duplicate branches returned in a deterministic order?
There was a problem hiding this comment.
Refs must match exactly remote/branch-name and you can't have two branches named the same (or can you?) so I don't think this would ever happen but wanted to check all possibilities just in case.
|
|
||
|
|
||
| def generate_pr_description(branch_name, amd_tag, arm_tag, prow_job_url, rebase_script_succeded): | ||
| base = (f"amd64: {amd_tag}\n" |
There was a problem hiding this comment.
Maybe we can add the changelog contents from #1255 here, too, when that work is done.
pmtk
force-pushed
the
rebase-python-wrapper
branch
from
4ddcaec
to
80251bd
Compare
| @@ -688,7 +688,7 @@ rebase_to() { | |||
| exit 1 | |||
| fi | |||
|
|
|||
| rebase_branch="rebase-${ver_stream}+amd64-${amd64_date}+arm64-${arm64_date}" | |||
| rebase_branch="rebase-${ver_stream}_amd64-${amd64_date}_arm64-${arm64_date}" | |||
There was a problem hiding this comment.
I noticed that + are not working good with prow's github query as they're used to join filters together, example:
is:pr+repo:openshift/microshift+author:microshift-rebase-script+head:rebase-4.12.0-0.nightly+amd64-2023-01-10-062211+arm64-2023-01-12-221036
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dhellmann, pmtk The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/retest |
|
@pmtk: all tests passed! Full PR test history. Your PR dashboard. 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/test-infra repository. I understand the commands that are listed here. |
Wraps rebase.sh with extra goodies for better interactions with PRs.
Checks
rebase.shexit code, so case of error the logs is committed along of any other staging changes, PR's title will get*FAILURE*prefix and PR's description will have big (h1) message to check committed rebase.sh log.If PR exists for the branch (which name is amd64's release tag), PR desc will be updated.
PR description now includes: amd64 and arm64 release tags, and (deduced) prow job link.
Obsoletes
create_pr.py