Add build link to rebaseline-o-matic CL descriptions.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py

 # Copyright 2014 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.
 
 """Fetches a copy of the latest state of a W3C test repository and commits.
 
 If this script is given the argument --auto-update, it will also:
  1. Upload a CL.
  2. Trigger try jobs and wait for them to complete.
  3. Make any changes that are required for new failing tests.
  4. Commit the CL.
 
 If this script is given the argument --auto-update, it will also attempt to
 upload a CL, trigger try jobs, and make any changes that are required for
 new failing tests before committing.
 """
 
 import argparse
-import json
 import logging
-import re
 
 from webkitpy.common.net.git_cl import GitCL
 from webkitpy.common.webkit_finder import WebKitFinder
+from webkitpy.common.net.buildbot import current_build_link
 from webkitpy.layout_tests.models.test_expectations import TestExpectations, TestExpectationParser
 from webkitpy.w3c.common import WPT_REPO_URL, CSS_REPO_URL, WPT_DEST_NAME, CSS_DEST_NAME, exportable_commits_since
 from webkitpy.w3c.directory_owners_extractor import DirectoryOwnersExtractor
 from webkitpy.w3c.local_wpt import LocalWPT
 from webkitpy.w3c.test_copier import TestCopier
 from webkitpy.w3c.wpt_expectations_updater import WPTExpectationsUpdater
 
 # Settings for how often to check try job results and how long to wait.
 POLL_DELAY_SECONDS = 2 * 60
 TIMEOUT_SECONDS = 180 * 60
@@ skipping 333 matching lines @@
     def get_directory_owners(self):
         """Returns a list of email addresses of owners of changed tests."""
         _log.info('Gathering directory owners emails to CC.')
         changed_files = self.host.cwd().changed_files()
         extractor = DirectoryOwnersExtractor(self.fs)
         extractor.read_owner_map()
         return extractor.list_owners(changed_files)
 
     def _cl_description(self):
         description = self.check_run(['git', 'log', '-1', '--format=%B'])
-        build_link = self._build_link()
+        build_link = current_build_link(self.host)
         if build_link:
             description += 'Build: %s\n\n' % build_link
         description += 'TBR=qyearsley@chromium.org\n'
         # Move any NOEXPORT tag to the end of the description.
         description = description.replace('NOEXPORT=true', '')
         description = description.replace('\n\n\n\n', '\n\n')
         description += 'NOEXPORT=true'
         return description
 
-    def _build_link(self):
-        """Returns a link to a job, if running on buildbot."""
-        master_name = self.host.environ.get('BUILDBOT_MASTERNAME')
-        builder_name = self.host.environ.get('BUILDBOT_BUILDERNAME')
-        build_number = self.host.environ.get('BUILDBOT_BUILDNUMBER')
-        if not (master_name and builder_name and build_number):
-            return None
-        return 'https://build.chromium.org/p/%s/builders/%s/builds/%s' % (master_name, builder_name, build_number)
-
     def fetch_new_expectations_and_baselines(self):
         """Adds new expectations and downloads baselines based on try job results, then commits and uploads the change."""
         _log.info('Adding test expectations lines to LayoutTests/TestExpectations.')
         line_adder = WPTExpectationsUpdater(self.host)
         line_adder.run()
         message = 'Update test expectations and baselines.'
         self.check_run(['git', 'commit', '-a', '-m', message])
         self.git_cl.run(['upload', '-m', message, '--rietveld'])
 
     def update_all_test_expectations_files(self, deleted_tests, renamed_tests):
@@ skipping 39 matching lines @@
         """Returns a dict mapping source to dest name for layout tests that have been renamed."""
         out = self.check_run(['git', 'diff', 'origin/master', '-M100%', '--diff-filter=R', '--name-status'])
         renamed_tests = {}
         for line in out.splitlines():
             _, source_path, dest_path = line.split()
             source_test = self.finder.layout_test_name(source_path)
             dest_test = self.finder.layout_test_name(dest_path)
             if source_test and dest_test:
                 renamed_tests[source_test] = dest_test
         return renamed_tests