[release] Make roll-branch CLs private
https://chromium-review.googlesource.com/561001 was not sufficient, because we don't use the --gerrit flag in V8 anymore. Now we explicitly pass an option for private upload. TBR=hablich@chromium.org,tandrii@chromium.org NOTRY=true Bug: v8:6574 Change-Id: Ib8e2883795f26f22ac47e648b37c47f3a0a60a40 Reviewed-on: https://chromium-review.googlesource.com/561378 Reviewed-by: Michael Achenbach <machenbach@chromium.org> Commit-Queue: Michael Achenbach <machenbach@chromium.org> Cr-Commit-Position: refs/heads/master@{#46439}
This commit is contained in:
parent
78c74e68f7
commit
de704bb015
@ -221,7 +221,8 @@ class LandBranch(Step):
|
|||||||
else:
|
else:
|
||||||
self.GitUpload(author=self._options.author,
|
self.GitUpload(author=self._options.author,
|
||||||
force=True,
|
force=True,
|
||||||
bypass_hooks=True)
|
bypass_hooks=True,
|
||||||
|
private=True)
|
||||||
cmd = "cl land --bypass-hooks -f"
|
cmd = "cl land --bypass-hooks -f"
|
||||||
if self._options.dry_run:
|
if self._options.dry_run:
|
||||||
print "Dry run. Command:\ngit %s" % cmd
|
print "Dry run. Command:\ngit %s" % cmd
|
||||||
|
@ -206,7 +206,8 @@ class GitRecipesMixin(object):
|
|||||||
self.Git(MakeArgs(args), **kwargs)
|
self.Git(MakeArgs(args), **kwargs)
|
||||||
|
|
||||||
def GitUpload(self, reviewer="", author="", force=False, cq=False,
|
def GitUpload(self, reviewer="", author="", force=False, cq=False,
|
||||||
bypass_hooks=False, cc="", use_gerrit=False, **kwargs):
|
bypass_hooks=False, cc="", use_gerrit=False,
|
||||||
|
private=False, **kwargs):
|
||||||
args = ["cl upload --send-mail"]
|
args = ["cl upload --send-mail"]
|
||||||
if author:
|
if author:
|
||||||
args += ["--email", Quoted(author)]
|
args += ["--email", Quoted(author)]
|
||||||
@ -222,6 +223,7 @@ class GitRecipesMixin(object):
|
|||||||
args += ["--cc", Quoted(cc)]
|
args += ["--cc", Quoted(cc)]
|
||||||
if use_gerrit:
|
if use_gerrit:
|
||||||
args += ["--gerrit"]
|
args += ["--gerrit"]
|
||||||
|
if private:
|
||||||
args += ["--private"]
|
args += ["--private"]
|
||||||
# TODO(machenbach): Check output in forced mode. Verify that all required
|
# TODO(machenbach): Check output in forced mode. Verify that all required
|
||||||
# base files were uploaded, if not retry.
|
# base files were uploaded, if not retry.
|
||||||
|
@ -968,7 +968,7 @@ TBR=reviewer@chromium.org"""
|
|||||||
Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "",
|
Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "",
|
||||||
cb=CheckVersionCommit),
|
cb=CheckVersionCommit),
|
||||||
Cmd("git cl upload --send-mail --email \"author@chromium.org\" "
|
Cmd("git cl upload --send-mail --email \"author@chromium.org\" "
|
||||||
"-f --bypass-hooks", ""),
|
"-f --bypass-hooks --private", ""),
|
||||||
Cmd("git cl land --bypass-hooks -f", ""),
|
Cmd("git cl land --bypass-hooks -f", ""),
|
||||||
Cmd("git fetch", ""),
|
Cmd("git fetch", ""),
|
||||||
Cmd("git log -1 --format=%H --grep="
|
Cmd("git log -1 --format=%H --grep="
|
||||||
@ -1271,7 +1271,7 @@ LOG=N
|
|||||||
Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], ""),
|
Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], ""),
|
||||||
RL("reviewer@chromium.org"), # V8 reviewer.
|
RL("reviewer@chromium.org"), # V8 reviewer.
|
||||||
Cmd("git cl upload --send-mail -r \"reviewer@chromium.org\" "
|
Cmd("git cl upload --send-mail -r \"reviewer@chromium.org\" "
|
||||||
"--bypass-hooks --cc \"ulan@chromium.org\" --gerrit --private", ""),
|
"--bypass-hooks --cc \"ulan@chromium.org\" --gerrit", ""),
|
||||||
Cmd("git checkout -f %s" % TEST_CONFIG["BRANCHNAME"], ""),
|
Cmd("git checkout -f %s" % TEST_CONFIG["BRANCHNAME"], ""),
|
||||||
RL("LGTM"), # Enter LGTM for V8 CL.
|
RL("LGTM"), # Enter LGTM for V8 CL.
|
||||||
Cmd("git cl presubmit", "Presubmit successfull\n"),
|
Cmd("git cl presubmit", "Presubmit successfull\n"),
|
||||||
@ -1653,7 +1653,7 @@ NOTREECHECKS=true
|
|||||||
Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], ""),
|
Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], ""),
|
||||||
RL("reviewer@chromium.org"), # V8 reviewer.
|
RL("reviewer@chromium.org"), # V8 reviewer.
|
||||||
Cmd("git cl upload --send-mail -r \"reviewer@chromium.org\" "
|
Cmd("git cl upload --send-mail -r \"reviewer@chromium.org\" "
|
||||||
"--bypass-hooks --cc \"ulan@chromium.org\" --gerrit --private", ""),
|
"--bypass-hooks --cc \"ulan@chromium.org\" --gerrit", ""),
|
||||||
Cmd("git checkout -f %s" % TEST_CONFIG["BRANCHNAME"], ""),
|
Cmd("git checkout -f %s" % TEST_CONFIG["BRANCHNAME"], ""),
|
||||||
RL("LGTM"), # Enter LGTM for V8 CL.
|
RL("LGTM"), # Enter LGTM for V8 CL.
|
||||||
Cmd("git cl presubmit", "Presubmit successfull\n"),
|
Cmd("git cl presubmit", "Presubmit successfull\n"),
|
||||||
|
Loading…
Reference in New Issue
Block a user