AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[release] Fix branch creator after private CLs were disabled

Browse Source 
TBR=mslekova@chromium.org
NOTRY=true

Bug: chromium:877964
Change-Id: Ia7ea1094ea339f6e956cb7241f7d35913b7821b2
Reviewed-on: https://chromium-review.googlesource.com/1190502
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#55430}
This commit is contained in:
Michael Achenbach 2018-08-27 16:45:02 +02:00 committed by Commit Bot
parent a5f627d8ee
commit 15505a1b29
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/release/create_release.py
View File

@ -221,8 +221,7 @@ class LandBranch(Step):
else:
self.GitUpload(author=self._options.author,
force=True,
bypass_hooks=True,
private=True)
bypass_hooks=True)
cmd = "cl land --bypass-hooks -f"
if self._options.dry_run:
print "Dry run. Command:\ngit %s" % cmd

6
tools/release/git_recipes.py
View File

@ -206,8 +206,8 @@ class GitRecipesMixin(object):
self.Git(MakeArgs(args), **kwargs)
def GitUpload(self, reviewer="", author="", force=False, cq=False,
cq_dry_run=False, bypass_hooks=False, cc="", private=False,
tbr_reviewer="", **kwargs):
cq_dry_run=False, bypass_hooks=False, cc="", tbr_reviewer="",
**kwargs):
args = ["cl upload --send-mail"]
if author:
args += ["--email", Quoted(author)]
@ -226,8 +226,6 @@ class GitRecipesMixin(object):
if cc:
args += ["--cc", Quoted(cc)]
args += ["--gerrit"]
if private:
args += ["--private"]
# TODO(machenbach): Check output in forced mode. Verify that all required
# base files were uploaded, if not retry.
self.Git(MakeArgs(args), pipe=False, **kwargs)

2
tools/release/test_scripts.py
View File

@ -934,7 +934,7 @@ TBR=reviewer@chromium.org"""
Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "",
cb=CheckVersionCommit),
Cmd("git cl upload --send-mail --email \"author@chromium.org\" "
"-f --bypass-hooks --gerrit --private", ""),
"-f --bypass-hooks --gerrit", ""),
Cmd("git cl land --bypass-hooks -f", ""),
Cmd("git fetch", ""),
Cmd("git log -1 --format=%H --grep="