From 7500552a8f42a03b4cc34f3e204310acb18ea8c2 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Thu, 18 Nov 2021 08:59:03 +0100 Subject: [PATCH] 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 Commit-Queue: Mirko Bonadei Commit-Queue: Christoffer Jansson Reviewed-by: Christoffer Jansson Cr-Commit-Position: refs/heads/main@{#35373} --- tools_webrtc/autoroller/roll_deps.py | 2 +- tools_webrtc/version_updater/update_version.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools_webrtc/autoroller/roll_deps.py b/tools_webrtc/autoroller/roll_deps.py index 08b56a470b..4d78ceada7 100755 --- a/tools_webrtc/autoroller/roll_deps.py +++ b/tools_webrtc/autoroller/roll_deps.py @@ -646,7 +646,7 @@ def _UploadCL(commit_queue_mode): 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', diff --git a/tools_webrtc/version_updater/update_version.py b/tools_webrtc/version_updater/update_version.py index 3c2be3fe75..6c01476535 100644 --- a/tools_webrtc/version_updater/update_version.py +++ b/tools_webrtc/version_updater/update_version.py @@ -131,10 +131,11 @@ def _UploadCL(commit_queue_mode): '--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)