def open_mr():
git_tool.fetch(['master'])
if git_tool.is_branch_diverged('origin/master'):
mr = cr_tool.create_mr(git_tool.get_repo(), squashed_branch, assignee, "WIP: "+title)
cr_tool.approve_build(git_tool.get_repo(), squashed_branch, build_number)
im_tool.send_message(hipchat_assigner, "MR {0} has been assigned to @{1}".format(mr, hipchat_assignee))
im_tool.send_message(hipchat_assignee, "Hey, @{0} sent you a MR to review: {1}".format(hipchat_assigner, mr))
return mr, None
return None, None
def __call__(self, target):
check_root()
to_fetch = None
if issue_tracker_tool.ISSUE_BE_LIKE.match(target) is None:
# doesn't look like an issue
to_fetch = [target]
resolve_errors(git_tool.recurse_submodules(lambda: git_tool.fetch(to_fetch)), **FETCH_HANDLING)
kind = None
if all(x[1] for x in git_tool.recurse_submodules(lambda: git_tool.is_remote_branch(target))):
kind = "branch"
elif all(x[1] for x in git_tool.recurse_submodules(lambda: git_tool.is_tag(target))):
kind = "tag"
elif issue_tracker_tool.validate_issue(target) is not None:
_target = target
target = branchname_from_issue(target, test=True)
kind = "branch"
if target is None:
print ("Can't find any matching branches. You probably didn't run 'new-feature'")
do_new_feature = raw_input("Do you want to run it now [y/N]?")
if do_new_feature in YES:
new_feature(_target,labels=None)
target = branchname_from_issue(_target)
else:
print RED("Please run new-feature first")
sys.exit(1)
if kind is not None:
resolve_errors(git_tool.recurse_submodules(lambda: git_tool.checkout_remote(target, kind)),
title="Checking out %s %s..." % (kind, target))
else:
print "Failed to resolve target '%s'" % target
def __call__(self, build_no, project="Android,Context,Discovery"):
check_root()
tag = "cibuild_%s" % build_no
resolve_errors(git_tool.recurse_submodules(lambda: git_tool.fetch()), **FETCH_HANDLING)
# make sure we get the correct week even if we freeze on Sunday
now = datetime.datetime.now()
day = datetime.timedelta(days=1)
cal = (now+day).isocalendar()
year = cal[0]
pulse = cal[1]
branchname = "rc-%d-%02d" % (year, pulse)
resolve_errors(git_tool.recurse_submodules(lambda: git_tool.new_branch(branchname, tag)),
title="Freezing into %s" % branchname)
resolve_errors(git_tool.recurse_submodules(lambda: git_tool.forcepush(branchname)),
title="Pushing %s" % branchname)
def protect():
repo = git_tool.get_repo()
success = cr_tool.protect_branch(repo, branchname)
return None, None if success else "Failed"
def mark_issues_to_rc():
"""
mark issues as IN_RC:
we search Jira for all issues with IN_MASTER status and then exclude issues not found in the git log
of the branchname
"""
jql = 'project in ({0}) and status="{1}"'.format(project, issue_tracker_tool.JiraStatus.LANDED_IN_MASTER)
issues = issue_tracker_tool.search(jql)
keys_in_master = [issue.key for issue in issues]
exclude = issues_not_in_branch(branchname)
print 'excluding issues not in {0}'.format(branchname), exclude
for key in set(keys_in_master) - set(exclude):
print "{0}: marking in rc".format(key)
issue_tracker_tool.mark_in_rc(key, branchname)
resolve_errors(git_tool.recurse_submodules(protect), title="Protecting %s" % branchname)
mark_issues_to_rc()
print BOLD("Initiating a build")
rc_build_no, success = builder_tool.build_launcher(branch=branchname,
profiles=["Debug"],
block=True,
gitlab_token=cr_tool.get_gitlab_token(),
split_apks="yes")
if success:
print BOLD("Updating Rollout")
rollout_tool.create_release(rc_build_no, 0) # freezing a release is always with distribution=0
print BOLD("Sending event to Timebox")
timebox_tool.send_event('freeze', rc_build_no, '0', pulse, builder_tool.get_build_path(str(rc_build_no)))
def is_ready_to_land():
if not fetched:
git_tool.fetch([branchname, 'master'])
if git_tool.is_merged_with("origin/%s" % branchname, ref="origin/master"):
return None, None
err = []
if not git_tool.is_merged_with("origin/master", ref="origin/%s" % branchname):
err.append("Not rebased!")
approvals = list(cr_tool.get_signed_comments(git_tool.get_repo(), branchname))
body = lambda x: x['body']
built = filter(compose(cr_tool.ApproveBuild.filter_message, body), approvals)
cr = filter(compose(cr_tool.ApproveCR.filter_message, body), approvals)
qa = filter(compose(cr_tool.ApproveQA.filter_message, body), approvals)
ui = filter(compose(cr_tool.ApproveUITests.filter_message, body), approvals)
probe = filter(compose(cr_tool.ApproveProbeTests.filter_message, body), approvals)
ret = []
if len(built) == 0:
err.append("Wasn't built!")
else:
ret.extend('Built by %s at %s' % (x['author']['name'], x['created_at']) for x in built)
if len(cr) == 0:
err.append("Wasn't reviewed!")
else:
ret.extend('Reviewd by %s at %s' % (x['author']['name'], x['created_at']) for x in cr)
if len(qa) == 0:
err.append("Didn't pass QA!")
else:
ret.extend("Passed QA's %s at %s" % (x['author']['name'], x['created_at']) for x in qa)
if len(ui) == 0:
err.append("Didn't pass UI tests!")
else:
ret.extend("Passed UI Tests at %s" % x['created_at'] for x in ui)
if len(probe) == 0:
err.append("Didn't pass Probe benchmark test")
else:
ret.extend("Passed Probe benchmark test at %s" % x['created_at'] for x in probe)
return "\n".join(ret), (None if len(err) == 0 else "\n".join(err))
def __call__(self):
check_root()
uninited_modules = git_tool.get_uninited_submodules()
if uninited_modules:
display_uninited_modules_instructions(uninited_modules)
return
current_branch = get_current_branch()
resolve_errors(git_tool.recurse_submodules(lambda: git_tool.fetch([current_branch])), **FETCH_HANDLING)
resolve_errors(git_tool.recurse_submodules(lambda: git_tool.rebase_if_needed(current_branch)), **REBASE_HANDLING)
resolve_errors(git_tool.fix_refs(), title="Fixing submodule references")
resolve_errors(git_tool.recurse_submodules(git_tool.push), title="Pushing...")
def __call__(self, namespace):
check_root()
branch = get_current_branch()
authors = Counter()
if is_squashed_branch(branch):
print "You are trying to submit a squashed branch doll, go back to the original branch, it'll surely work!"
return
squashed_branch = append_squashed_branch_suffix(branch)
issue = issue_from_branchname(branch)
issue = issue_tracker_tool.validate_issue(issue)
title = issue.fields.summary
title = "%s: %s" % (issue.key, title)
uninited_modules = git_tool.get_uninited_submodules()
if uninited_modules:
display_uninited_modules_instructions(uninited_modules)
return
resolve_errors(git_tool.recurse_submodules(lambda: git_tool.fetch(['master'])), **FETCH_HANDLING)
resolve_errors(git_tool.recurse_submodules(lambda: git_tool.rebase_if_needed('master')), **REBASE_HANDLING)
def get_original_author():
if git_tool.is_branch_diverged('origin/master'):
authors[git_tool.get_author()] += 1
list(git_tool.recurse_submodules(get_original_author))
author = authors.most_common(1)[0][0] if authors else None
def create_squashed_branch():
git_tool.gitcmd(['branch', '-f', squashed_branch, branch])
return git_tool.gitcmd(['checkout', squashed_branch])
def squash():
ret = err = None
if git_tool.is_branch_diverged('origin/master'):
ret, err = git_tool.squash(title, author)
return ret, err
def push_and_back():
git_tool.gitcmd(['checkout', branch])
return git_tool.forcepush(squashed_branch)
resolve_errors(git_tool.recurse_submodules(git_tool.forcepush), title="Pushing...")
resolve_errors(git_tool.recurse_submodules(create_squashed_branch), title="Creating squashed branch...")
resolve_errors(git_tool.recurse_submodules(squash), title="Squashing...")
resolve_errors(git_tool.fix_refs(), title="Fixing refs...")
resolve_errors(git_tool.recurse_submodules(push_and_back), title="Pushing squashed branch...")
self.process(namespace, squashed_branch)
def __call__(self, what):
resolve_errors(git_tool.recurse_submodules(lambda: git_tool.fetch()), **FETCH_HANDLING)
if self.is_issue(what):
branchname = branchname_from_issue(what, test=True, squashed=True)
else:
branchname = what
def approve():
if git_tool.is_merged_with("origin/%s" % branchname, ref="origin/master"):
return None, None
added = self.APPROVAL_FUNC(git_tool.get_repo(), branchname)
return added, None
resolve_errors(git_tool.recurse_submodules(approve), title="Marking your approvals...")
def __call__(self, checks=True, push=True):
check_root()
if checks:
check_config()
uninited_modules = git_tool.get_uninited_submodules()
if uninited_modules:
display_uninited_modules_instructions(uninited_modules)
return
resolve_errors(git_tool.recurse_submodules(lambda: git_tool.fetch(['master'])), **FETCH_HANDLING)
resolve_errors(git_tool.recurse_submodules(lambda: git_tool.rebase_if_needed('master')), **REBASE_HANDLING)
resolve_errors(git_tool.fix_refs(), title="Fixing submodule references")
if push:
resolve_errors(git_tool.recurse_submodules(git_tool.forcepush), title="Pushing...")
def __call__(self, what, ok_no_ff):
check_root()
if get_current_branch() != 'master':
print "You should be on the master branch before landing a feature, sweetie!"
return
fetched = False
if issue_tracker_tool.ISSUE_BE_LIKE.match(what) is not None:
issue = what
branchname = branchname_from_issue(issue, test=True, squashed=True)
if branchname is None:
resolve_errors(git_tool.recurse_submodules(lambda: git_tool.fetch()), **FETCH_HANDLING)
fetched = True
branchname = branchname_from_issue(what, squashed=True)
else:
branchname = what
issue = issue_from_branchname(what, squashed=True)
if not is_squashed_branch(branchname):
print YELLOW("Warning: landning non-squashed branch!")
if issue is None:
print YELLOW("Warning: unknown issue!")
def is_ready_to_land():
if not fetched:
git_tool.fetch([branchname, 'master'])
if git_tool.is_merged_with("origin/%s" % branchname, ref="origin/master"):
return None, None
err = []
if not git_tool.is_merged_with("origin/master", ref="origin/%s" % branchname):
err.append("Not rebased!")
approvals = list(cr_tool.get_signed_comments(git_tool.get_repo(), branchname))
body = lambda x: x['body']
built = filter(compose(cr_tool.ApproveBuild.filter_message, body), approvals)
cr = filter(compose(cr_tool.ApproveCR.filter_message, body), approvals)
qa = filter(compose(cr_tool.ApproveQA.filter_message, body), approvals)
ui = filter(compose(cr_tool.ApproveUITests.filter_message, body), approvals)
probe = filter(compose(cr_tool.ApproveProbeTests.filter_message, body), approvals)
ret = []
if len(built) == 0:
err.append("Wasn't built!")
else:
ret.extend('Built by %s at %s' % (x['author']['name'], x['created_at']) for x in built)
if len(cr) == 0:
err.append("Wasn't reviewed!")
else:
ret.extend('Reviewd by %s at %s' % (x['author']['name'], x['created_at']) for x in cr)
if len(qa) == 0:
err.append("Didn't pass QA!")
else:
ret.extend("Passed QA's %s at %s" % (x['author']['name'], x['created_at']) for x in qa)
if len(ui) == 0:
err.append("Didn't pass UI tests!")
else:
ret.extend("Passed UI Tests at %s" % x['created_at'] for x in ui)
if len(probe) == 0:
err.append("Didn't pass Probe benchmark test")
else:
ret.extend("Passed Probe benchmark test at %s" % x['created_at'] for x in probe)
return "\n".join(ret), (None if len(err) == 0 else "\n".join(err))
resolve_errors(git_tool.recurse_submodules(is_ready_to_land), **APPROVAL_HANDLING)
def do_push():
return git_tool.push('master')
def do_merge():
ret, err = git_tool.gitcmd(['merge', '--ff' if ok_no_ff else '--ff-only', 'origin/%s' % branchname])
if err is not None:
return ret, err
return ret, None
merge_success = resolve_errors(git_tool.recurse_submodules(do_merge), **MERGE_HANDLING)
if merge_success:
resolve_errors(git_tool.fix_refs(), title="Fixing submodule references")
push_success = resolve_errors(git_tool.recurse_submodules(do_push), title="Pushing...")
# Make sure all MR for this issue in gitlab are closed
def check_open_mr():
repo = git_tool.get_repo()
project = cr_tool.get_project(repo)
mr = cr_tool.get_open_mr(project, branchname)
if mr is not None:
print RED("ALERT: merge request is still open in GitLab for {}!".format(repo))
return None, "ALERT: merge request is still open in GitLab"
return None, None
gitlab_check_success = resolve_errors(git_tool.recurse_submodules(check_open_mr), title="Checking GitLab status...")
if not gitlab_check_success:
print RED("ERROR: there are still open MR in GitLab after land for {}, something is terribly wrong!!".format(issue))
if push_success and issue is not None:
update_jira(partial(issue_tracker_tool.land, issue), 'landed in master')
return push_success
return False
