[release] Fix branch creator after private CLs were disabled

mi-ac · Commit Bot · commit 15505a1b29bd · 2018-08-27T14:48:15.000Z
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}
diff --git a/tools/release/create_release.py b/tools/release/create_release.py
@@ -221,8 +221,7 @@ def RunStep(self):
     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
diff --git a/tools/release/git_recipes.py b/tools/release/git_recipes.py
@@ -206,8 +206,8 @@ def GitApplyPatch(self, patch_file, reverse=False, **kwargs):
     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 @@ def GitUpload(self, reviewer="", author="", force=False, cq=False,
     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)
diff --git a/tools/release/test_scripts.py b/tools/release/test_scripts.py
@@ -934,7 +934,7 @@ def CheckVersionCommit():
       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="
