Skip to content
This repository was archived by the owner on Feb 6, 2025. It is now read-only.

Support multiple target branches in pr rebase #1158

Merged
merged 1 commit into from
Jun 15, 2020
Merged
Changes from all commits
Commits
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
15 changes: 8 additions & 7 deletions ci/tasks/rebase.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,26 @@

change_author = os.getenv('GIT_COMMITTER_NAME', 'CaaSP Jenkins')
author_email = os.getenv('GIT_COMMITTER_EMAIL', 'containers-bugowner@suse.de')
branch_name = os.getenv("BRANCH_NAME","master")
change_id = os.getenv("CHANGE_ID")
target = os.getenv("CHANGE_TARGET")
workspace = os.getenv("WORKSPACE","")

if branch_name.lower() == "master":
print("Rebase not required for master.")
if not change_id:
print("Not a PR. Rebase not required.")
sys.exit(0)

try:
cmd = 'git -c "user.name={}" -c "user.email={}" \
rebase origin/master'.format(change_author, author_email)
cmd = (f'git -c "user.name={change_author}" -c "user.email={author_email}"'
f' rebase origin/{target}')
cwd = workspace+"/skuba"
subprocess.check_call(cmd, cwd=cwd, shell=True)
except subprocess.CalledProcessError as ex:
print(ex)
print(Format.alert("Rebase failed, manual rebase is required."))
print("Rebase failed, manual rebase is required.")
subprocess.check_call("git rebase --abort", cwd=cwd)
sys.exit(1)
except Exception as ex:
print(ex)
print(Format.alert("Unknown error exiting."))
print("Unknown error exiting.")
sys.exit(2)