[release] Fix create-release script for Gerrit

This uploads roll-branch CLs before landing and fixes an
ambiguity bug when pushing tags.

NOTRY=true
TBR=hablich@chromium.org

Bug: chromium:738679
Change-Id: I51e03d714ec97ee2d9bca4ecaf753d66038891c1
Reviewed-on: https://chromium-review.googlesource.com/558415Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#46382}

tools/release/common_includes.py

@@ -395,7 +395,7 @@ class GitInterface(VCInterface):
                     "git updater is lagging behind?")
 
     self.step.Git("tag %s %s" % (tag, commit))
-    self.step.Git("push origin %s" % tag)
+    self.step.Git("push origin refs/tags/%s:refs/tags/%s" % (tag, tag))
 
   def CLLand(self):
     self.step.GitCLLand()

tools/release/create_release.py

@@ -221,6 +221,7 @@ class CommitBranch(Step):
 
     if not text:  # pragma: no cover
       self.Die("Commit message editing failed.")
+    text += "\n\nTBR=%s" % self._options.reviewer
     self["commit_title"] = text.splitlines()[0]
     TextToFile(text, self.Config("COMMITMSG_FILE"))
 
@@ -229,10 +230,16 @@ class CommitBranch(Step):
     os.remove(self.Config("CHANGELOG_ENTRY_FILE"))
 
 
-class PushBranch(Step):
-  MESSAGE = "Push changes."
+class LandBranch(Step):
+  MESSAGE = "Upload and land changes."
 
   def RunStep(self):
+    if self._options.dry_run:
+      print "Dry run - upload CL."
+    else:
+      self.GitUpload(author=self._options.author,
+                     force=True,
+                     bypass_hooks=True)
     cmd = "cl land --bypass-hooks -f"
     if self._options.dry_run:
       print "Dry run. Command:\ngit %s" % cmd
@@ -305,7 +312,7 @@ class CreateRelease(ScriptsBase):
       SetVersion,
       EnableMergeWatchlist,
       CommitBranch,
-      PushBranch,
+      LandBranch,
       TagRevision,
       CleanUp,
     ]

tools/release/test_scripts.py

@@ -861,7 +861,7 @@ Performance and stability improvements on all platforms."""
           "\"Version 3.22.5 (based on push_hash)\""
           " origin/candidates", "hsh_to_tag"),
       Cmd("git tag 3.22.5 hsh_to_tag", ""),
-      Cmd("git push origin 3.22.5", ""),
+      Cmd("git push origin refs/tags/3.22.5:refs/tags/3.22.5", ""),
       Cmd("git checkout -f origin/master", ""),
       Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], ""),
       Cmd("git branch -D %s" % TEST_CONFIG["CANDIDATESBRANCH"], ""),
@@ -905,7 +905,9 @@ Performance and stability improvements on all platforms."""
 
 Log text 1 (issue 321).
 
-Performance and stability improvements on all platforms."""
+Performance and stability improvements on all platforms.
+
+TBR=reviewer@chromium.org"""
 
     def ResetChangeLog():
       last_change_log = """1999-04-05: Version 3.22.4
@@ -969,12 +971,14 @@ Performance and stability improvements on all platforms."""
           cb=self.WriteFakeWatchlistsFile),
       Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "",
           cb=CheckVersionCommit),
+      Cmd("git cl upload --send-mail --email \"author@chromium.org\" "
+          "-f --bypass-hooks", ""),
       Cmd("git cl land --bypass-hooks -f", ""),
       Cmd("git fetch", ""),
       Cmd("git log -1 --format=%H --grep="
           "\"Version 3.22.5\" origin/3.22.5", "hsh_to_tag"),
       Cmd("git tag 3.22.5 hsh_to_tag", ""),
-      Cmd("git push origin 3.22.5", ""),
+      Cmd("git push origin refs/tags/3.22.5:refs/tags/3.22.5", ""),
       Cmd("git checkout -f origin/master", ""),
       Cmd("git branch", "* master\n  work-branch\n"),
       Cmd("git branch -D work-branch", ""),
@@ -1288,7 +1292,7 @@ LOG=N
           "\" refs/remotes/origin/candidates",
           "hsh_to_tag"),
       Cmd("git tag 3.22.5.1 hsh_to_tag", ""),
-      Cmd("git push origin 3.22.5.1", ""),
+      Cmd("git push origin refs/tags/3.22.5.1:refs/tags/3.22.5.1", ""),
       Cmd("git checkout -f origin/master", ""),
       Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], ""),
     ])