recipe_autoroller: ensure the trivial roll CLs always have CQ bit set (attempt #3)

recipes/recipe_modules/recipe_autoroller/api.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import hashlib
 import json
 import re
 
 from recipe_engine import recipe_api
 
@@ skipping 71 matching lines @@
 
 
 # These are different results of a roll attempt:
 #   - success means we have a working non-empty roll
 #   - empty means the repo is using latest revision of its dependencies
 #   - failure means there are roll candidates but none of them are suitable
 #     for an automated roll
 ROLL_SUCCESS, ROLL_EMPTY, ROLL_FAILURE = range(3)
 
 
+_AUTH_REFRESH_TOKEN_FLAG = (
+    '--auth-refresh-token-json=/creds/refresh_tokens/recipe-roller')
+
+
 def get_commit_message(roll_result, tbrs=()):
   """Construct a roll commit message from 'recipes.py autoroll' result.
   """
   message = 'Roll recipe dependencies (%s).\n' % (
       'trivial' if roll_result['trivial'] else 'nontrivial')
   message += COMMIT_MESSAGE_HEADER
   if not roll_result['trivial']:
     message += NON_TRIVIAL_MESSAGE
   message += COMMIT_MESSAGE_INFO
 
@@ skipping 135 matching lines @@
       # We have uploaded before, now let's check the diff hash to see if we
       # have uploaded this patchset before.
       change_data = json.loads(cat_result.stdout)
       cat_result.presentation.links['Issue %s' % change_data['issue']] = (
           change_data['issue_url'])
       # Pass --rietveld flag to match upload args below.
       self.m.git('cl', 'issue', change_data['issue'], '--rietveld', cwd=workdir)
       if change_data['diff_digest'] != diff_digest:
         need_to_upload = True
         rebase = True
+      elif roll_result['trivial']:
+        # We won't be uploading. Make sure trivial rolls don't get stuck
+        # if previous CQ attempt failed because of flake.
+        # Pass --rietveld flag to match upload args below.
+        self.m.git('cl', 'set-commit', '--rietveld', _AUTH_REFRESH_TOKEN_FLAG,
+                   cwd=workdir)
 
     if need_to_upload:
       tbrs = []
       if not rebase:
         tbrs = TRIVIAL_ROLL_TBR_EMAILS
       commit_message = (
           'Rebase' if rebase else get_commit_message(roll_result, tbrs=tbrs))
       if roll_result['trivial']:
         # Land immediately.
         upload_args = ['--use-commit-queue']
       else:
         upload_args = ['--send-mail', '--cq-dry-run']
       upload_args.extend(['--bypass-hooks', '-f'])
       # git cl upload doesn't work yet with gerrit and git cache.
       upload_args.extend(['--rietveld'])
-      upload_args.extend([
-          '--auth-refresh-token-json=/creds/refresh_tokens/recipe-roller'])
+      upload_args.extend([_AUTH_REFRESH_TOKEN_FLAG])
       self.m.git_cl.upload(
           commit_message, upload_args, name='git cl upload', cwd=workdir)
       issue_result = self.m.git(
           'cl', 'issue',
           name='git cl issue', stdout=self.m.raw_io.output(),
           cwd=workdir,
           step_test_data=lambda: self.m.raw_io.test_api.stream_output(
               'Issue number: '
               '123456789 (https://codereview.chromium.org/123456789)'))
 
       m = re.match('Issue number: (\d+) \((\S*)\)', issue_result.stdout.strip())
       if not m:
         self.m.python.failing_step(
             'git cl upload failed', 'git cl issue output "%s" is not valid' %
                                     issue_result.stdout.strip())
 
       change_data = {
         'issue': m.group(1),
         'issue_url': m.group(2),
         'diff_digest': diff_digest,
       }
       issue_result.presentation.links['Issue %s' % change_data['issue']] = (
           change_data['issue_url'])
       self.m.gsutil.upload(
           self.m.json.input(change_data),
           'recipe-roller-cl-uploads',
           cfg_digest)