commit 7500552a8f42a03b4cc34f3e204310acb18ea8c2
author Mirko Bonadei <mbonadei@webrtc.org> Thu Nov 18 07:59:03 2021
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Nov 18 08:45:36 2021
tree 3deb840e9df2ca83d07bcd855625c6d0b6d09df4
parent 7b0c6a3ae565f3d72239888c898241a840d69ae9

Fix WebRTC version updater bot.

No-Presubmit: True
Bug: webrtc:13373
Change-Id: If668e01f426d19d8d90328cb358a131425b23047
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/238168
Auto-Submit: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Christoffer Jansson <jansson@google.com>
Reviewed-by: Christoffer Jansson <jansson@google.com>
Cr-Commit-Position: refs/heads/main@{#35373}

tools_webrtc/autoroller/roll_deps.py

diff --git a/tools_webrtc/autoroller/roll_deps.py b/tools_webrtc/autoroller/roll_deps.py
index 08b56a4..4d78cea 100755
--- a/tools_webrtc/autoroller/roll_deps.py
+++ b/tools_webrtc/autoroller/roll_deps.py
@@ -646,7 +646,7 @@
         cmd.extend(['--send-mail', '--cc', NOTIFY_EMAIL])
     elif commit_queue_mode >= 1:
         logging.info('Starting CQ dry run...')
-        cmd.extend(['--cq-dry-run'])
+        cmd.extend(['-o', 'label=Commit-Queue+1'])
     extra_env = {
         'EDITOR': 'true',
         'SKIP_GCE_AUTH_FOR_GIT': '1',

tools_webrtc/version_updater/update_version.py

diff --git a/tools_webrtc/version_updater/update_version.py b/tools_webrtc/version_updater/update_version.py
index 3c2be3f..6c01476 100644
--- a/tools_webrtc/version_updater/update_version.py
+++ b/tools_webrtc/version_updater/update_version.py
@@ -131,10 +131,11 @@
            '--cc=""', '--bypass-watchlist']
     if commit_queue_mode >= 2:
         logging.info('Sending the CL to the CQ...')
-        cmd.extend(['--use-commit-queue'])
+        cmd.extend(['-o', 'label=Bot-Commit+1'])
+        cmd.extend(['-o', 'label=Commit-Queue+2'])
     elif commit_queue_mode >= 1:
         logging.info('Starting CQ dry run...')
-        cmd.extend(['--cq-dry-run'])
+        cmd.extend(['-o', 'label=Commit-Queue+1'])
     subprocess.check_call(cmd)