[release] Make auto-roller use bot-commit label

No-try: true Bug: chromium:1176141 Change-Id: I6caa0f9ce530ca3fcc6aa715326727f68aa5c240 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2690586 Reviewed-by: Liviu Rau <[email protected]> Commit-Queue: Michael Achenbach <[email protected]> Cr-Commit-Position: refs/heads/master@{#73449}
zhaoleipeng · Mar 16, 2021 · 7073b1a · 7073b1a
1 parent 2d13cc9
commit 7073b1a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/tools/release/auto_roll.py b/tools/release/auto_roll.py
@@ -155,13 +155,14 @@ def RunStep(self):
 
     message.append(ISSUE_MSG)
 
-    message.append("TBR=%s" % self._options.reviewer)
+    message.append("R=%s" % self._options.reviewer)
     self.GitCommit("\n\n".join(message),  author=self._options.author, cwd=cwd)
     if not self._options.dry_run:
       self.GitUpload(force=True,
                      bypass_hooks=True,
                      cq=self._options.use_commit_queue,
                      cq_dry_run=self._options.use_dry_run,
+                     set_bot_commit=True,
                      cwd=cwd)
       print("CL uploaded.")
     else:

diff --git a/tools/release/git_recipes.py b/tools/release/git_recipes.py
@@ -206,8 +206,9 @@ def GitApplyPatch(self, patch_file, reverse=False, **kwargs):
     self.Git(MakeArgs(args), **kwargs)
 
   def GitUpload(self, reviewer="", force=False, cq=False,
-                cq_dry_run=False, bypass_hooks=False, cc="", tbr_reviewer="",
-                no_autocc=False, message_file=None, **kwargs):
+                cq_dry_run=False, set_bot_commit=False, bypass_hooks=False,
+                cc="", tbr_reviewer="", no_autocc=False, message_file=None,
+                **kwargs):
     args = ["cl upload --send-mail"]
     if reviewer:
       args += ["-r", Quoted(reviewer)]
@@ -219,6 +220,8 @@ def GitUpload(self, reviewer="", force=False, cq=False,
       args.append("--use-commit-queue")
     if cq_dry_run:
       args.append("--cq-dry-run")
+    if set_bot_commit:
+      args.append("--set-bot-commit")
     if bypass_hooks:
       args.append("--bypass-hooks")
     if no_autocc:

diff --git a/tools/release/test_scripts.py b/tools/release/test_scripts.py
@@ -540,7 +540,7 @@ def CheckVersionCommit():
 CQ_INCLUDE_TRYBOTS=luci.chromium.try:win_optional_gpu_tests_rel
 CQ_INCLUDE_TRYBOTS=luci.chromium.try:android_optional_gpu_tests_rel
 
-TBR[email protected]"""
+R[email protected]"""
 
   # Snippet from the original DEPS file.
   FAKE_DEPS = """
@@ -624,7 +624,7 @@ def WriteDeps():
            self.ROLL_COMMIT_MSG),
           "", cwd=chrome_dir),
       Cmd("git cl upload --send-mail -f "
-          "--cq-dry-run --bypass-hooks", "",
+          "--cq-dry-run --set-bot-commit --bypass-hooks", "",
           cwd=chrome_dir),
       Cmd("git checkout -f master", "", cwd=chrome_dir),
       Cmd("git branch -D work-branch", "", cwd=chrome_dir),