commit b55c299f4d0ccc2e510e6ac88fe217bf5e5c4098
author Mirko Bonadei <mbonadei@webrtc.org> Mon Nov 29 12:48:48 2021
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Nov 29 12:54:01 2021
tree 73eddfa14bfb2dab6f74b118c768718d451725bb
parent e2044664bd977632d1b9f2eda37618178cc04ded

Avoid TBR in DEPS autoroller (use CC instead).

No-Presubmit: True
No-Try: True
Bug: None
Change-Id: I71c71de4ff9cfb1b9e59620b56a13ff4e94639eb
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/239361
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Andrey Logvin <landrey@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35430}

tools_webrtc/autoroller/roll_deps.py

diff --git a/tools_webrtc/autoroller/roll_deps.py b/tools_webrtc/autoroller/roll_deps.py
index 89553b3..ac2a865 100755
--- a/tools_webrtc/autoroller/roll_deps.py
+++ b/tools_webrtc/autoroller/roll_deps.py
@@ -491,7 +491,6 @@
         noun = 'dependency' if len(deps) == 1 else 'dependencies'
         commit_msg.append('%s %s' % (adjective, noun))
 
-    tbr_authors = ''
     if changed_deps_list:
         Section('Changed', changed_deps_list)
 
@@ -503,8 +502,6 @@
                 commit_msg.append(
                     '* %s: %s/+log/%s..%s' %
                     (c.path, c.url, c.current_rev[0:10], c.new_rev[0:10]))
-            if 'libvpx' in c.path or 'libaom' in c.path:
-                tbr_authors += 'marpan@webrtc.org, jianj@chromium.org, '
 
     if added_deps_paths:
         Section('Added', added_deps_paths)
@@ -529,8 +526,6 @@
     else:
         commit_msg.append('No update to Clang.\n')
 
-    if tbr_authors:
-        commit_msg.append('TBR=%s' % tbr_authors)
     commit_msg.append('BUG=None')
     return '\n'.join(commit_msg)
 
@@ -635,20 +630,36 @@
     return 2
 
 
-def _UploadCL(commit_queue_mode):
+def _GetCcRecipients(changed_deps_list):
+    """Returns a list of emails to notify based on the changed deps list.
+    """
+    cc_recipients = []
+    for c in changed_deps_list:
+        if 'libvpx' in c.path or 'libaom' in c.path:
+            cc_recipients.append('marpan@webrtc.org')
+            cc_recipients.append('jianj@chromium.org')
+    return cc_recipients
+
+
+def _UploadCL(commit_queue_mode, add_cc=None):
     """Upload the committed changes as a changelist to Gerrit.
 
     commit_queue_mode:
      - 2: Submit to commit queue.
      - 1: Run trybots but do not submit to CQ.
      - 0: Skip CQ, upload only.
+
+    add_cc: A list of email addresses to add as CC recipients.
     """
+    cc_recipients = [NOTIFY_EMAIL]
+    if add_cc:
+        cc_recipients.extend(add_cc)
     cmd = ['git', 'cl', 'upload', '--force', '--bypass-hooks']
     if commit_queue_mode >= 2:
         logging.info('Sending the CL to the CQ...')
         cmd.extend(['-o', 'label=Bot-Commit+1'])
         cmd.extend(['-o', 'label=Commit-Queue+2'])
-        cmd.extend(['--send-mail', '--cc', NOTIFY_EMAIL])
+        cmd.extend(['--send-mail', '--cc', ','.join(cc_recipients)])
     elif commit_queue_mode >= 1:
         logging.info('Starting CQ dry run...')
         cmd.extend(['-o', 'label=Commit-Queue+1'])
@@ -771,7 +782,7 @@
                                          current_commit_pos, new_commit_pos)
         logging.info('Uploading CL...')
         if not opts.dry_run:
-            _UploadCL(commit_queue_mode)
+            _UploadCL(commit_queue_mode, _GetCcRecipients(changed_deps))
     return 0