Remove CL upload logic from Perf Try Job workflow.

tools/perf/core/trybot_command.py

 # Copyright 2015 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 argparse
 import json
 import logging
 import os
 import platform
 import re
@@ skipping 428 matching lines @@
     if branch_name == 'HEAD':
       raise TrybotError('Not on a valid branch, looks like branch '
                         'is dettached. [branch:%s]' % branch_name)
 
     # Check if the tree is dirty: make sure the index is up to date and then
     # run diff-index
     RunGit(['update-index', '--refresh', '-q'], ignore_return_code=True)
     output = RunGit(['diff-index', 'HEAD'])
     if output:
       raise TrybotError(
-          'Cannot send a try job with a dirty tree. Please commit '
-          'your changes locally first in %s repository.' % repo_path)
+          'Cannot send a try job with a dirty tree.\nPlease commit locally and '
+          'upload your changes to rietveld in %s repository.' % repo_path)
 
     # Make sure the tree does have local commits.

[sullivan, 2016/10/07 14:50:07]

I think we actually don't care about this now as long as _GetChangeList() check
below does not fail?

[prasadv1, 2016/10/07 23:06:09]

Done.

     output = RunGit(['footers', 'HEAD'])
     if output:
       raise TrybotError('No local changes found in %s repository.' % repo_path)
 
     return (repo_name, branch_name)
 
   def _GetBaseGitHashForRepo(self, branch_name, git_url):
     """Gets the base revision for the repo on which local changes are made.
 
     Finds the upstream of the current branch that it is set to and gets
@@ skipping 31 matching lines @@
     if cur_remote == '.':
       return False
     cur_remote_url = RunGit(
         ['config', 'remote.%s.url' % cur_remote],
         'Failed to get remote.%s.url from git config' % cur_remote)
     if cur_remote_url.lower() == repo_git_url:
       return True
     raise TrybotError('URL %s on remote %s is not recognized on branch.'% (
         cur_remote_url, cur_remote))
 
+  def _GetChangeList(self):
+    """Gets the codereview URL for the current changes."""
+    output = RunGit(['cl', 'issue'],
+                    'Failed to run "git cl issue" command.')
+    match = re.search(r'https://codereview.chromium.org/[\d]+', output)

[Michael Achenbach, 2016/10/07 15:31:12]

This looks like it is rietveld only. Please make sure that the tooling will also
work with gerrit as the V8 time will mid-term switch over.

[tandrii(chromium), 2016/10/07 15:41:51]

Please, use --json flag and don't parse human messages that could be changed.

$ git cl issue --json output.json

[prasadv1, 2016/10/07 23:06:09]

Done.

[prasadv1, 2016/10/07 23:06:09]

Done. Now using git cl issue --json arg to get the issue number and issue url.

+    # Make sure the local commits are uploaded to rietveld.
+    if not match:
+      raise TrybotError(
+          'PLEASE NOTE: The workflow for Perf Try jobs is changed. '
+          'In order to run the perf try job, you must first upload your '
+          'changes to rietveld.')
+    return match.group(0)
+
   def _AttemptTryjob(self, options, extra_args):
     """Attempts to run a tryjob from a repo directory.
 
     Args:
       options: Command line arguments to run benchmark.
       extra_args: Extra arugments to run benchmark.
 
     Returns:
      If successful returns 0, otherwise 1.
     """
@@ skipping 12 matching lines @@
       if not repo_info:
         raise TrybotError('Unsupported repository %s' % repo_name)
 
       deps_override = None
       if repo_name != 'src':
         if not options.deps_revision:
           options.deps_revision = self._GetBaseGitHashForRepo(
               branch_name, repo_info.get('url'))
         deps_override = {repo_info.get('src'): options.deps_revision}
 
-      arguments = [options.benchmark_name] + extra_args
-
-      rietveld_url = self._UploadPatchToRietveld(repo_name, options)
-      print ('\nUploaded try job to rietveld.\nview progress here %s.'
+      rietveld_url = self._GetChangeList()
+      print ('\nRunning try job....\nview progress here %s.'
              '\n\tRepo Name: %s\n\tPath: %s\n\tBranch: %s' % (
                  rietveld_url, repo_name, repo_path, branch_name))
 
       for bot_platform in self._builder_names:
         if not self._builder_names[bot_platform]:
           logging.warning('No builder is found for %s', bot_platform)
           continue
         try:
+          arguments = [options.benchmark_name] + extra_args
           self._RunTryJob(bot_platform, arguments, deps_override)
         # Even if git cl try throws TrybotError exception for any platform,
         # keep sending try jobs to other platforms.
         except TrybotError, err:
           print err
     except TrybotError, error:
       print error
       return 1
     finally:
       # Restore to original working directory.
       os.chdir(original_workdir)
     return 0
 
-  def _UploadPatchToRietveld(self, repo_name, options):
-    """Uploads the patch to rietveld and returns rietveld URL."""
-    output = RunGit(['cl', 'upload', '-f', '--bypass-hooks', '-m',
-                     ('CL for %s perf tryjob to run %s benchmark '
-                      'on %s platform(s)' % (
-                          repo_name, options.benchmark_name, options.trybot))],
-                    'Could not upload to rietveld for %s' % repo_name)
-
-    match = re.search(r'https://codereview.chromium.org/[\d]+', output)
-    if not match:
-      raise TrybotError('Could not upload CL to rietveld for %s! Output %s' %
-                        (repo_name, output))
-    return match.group(0)
-
   def _RunTryJob(self, bot_platform, arguments, deps_override):

[tandrii(chromium), 2016/10/07 15:44:36]

this code as is will work with Gerrit too (support for which landing next week).

     """Executes perf try job with benchmark test properties.
 
     Args:
       bot_platform: Name of the platform to be generated.
       arguments: Command line arguments.
       deps_override: DEPS revision if needs to be overridden.
 
     Raises:
       TrybotError: When trybot fails to upload CL or run git try.
     """
     config = self._GetPerfConfig(bot_platform, arguments)
 
     # Generate git try command for available bots.
     git_try_command = ['cl', 'try', '-m', 'tryserver.chromium.perf']
 
      # Add Perf Test config to git try --properties arg.
     git_try_command.extend(['-p', 'perf_try_config=%s' % json.dumps(config)])
 
     error_msg_on_fail = 'Could not try CL for %s' % bot_platform
     # Add deps overrides to git try --properties arg.
     if deps_override:
       git_try_command.extend([
           '-p', 'deps_revision_overrides=%s' % json.dumps(deps_override)])
       error_msg_on_fail += ' with DEPS override (%s)' % deps_override
     for bot in self._builder_names[bot_platform]:
       git_try_command.extend(['-b', bot])
 
     RunGit(git_try_command, error_msg_on_fail)
     print 'Perf Try job sent to rietveld for %s platform.' % bot_platform