[chromedriver] Rename chromedriver2 target names to remove '2'.

chrome/test/chromedriver/run_buildbot_steps.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 """Runs all the buildbot steps for ChromeDriver except for update/compile."""
 
 import bisect
 import csv
 import datetime
@@ skipping 10 matching lines @@
 import time
 import urllib2
 import zipfile
 
 import archive
 import chrome_paths
 import util
 
 _THIS_DIR = os.path.abspath(os.path.dirname(__file__))
 GS_ARCHIVE_BUCKET = 'gs://chromedriver-prebuilts'
-GS_ZIP_PREFIX = 'chromedriver2_prebuilts'
+GS_ZIP_PREFIX = 'chromedriver_prebuilts'
 GS_RC_BUCKET = 'gs://chromedriver-rc'
 GS_RELEASE_PATH = GS_RC_BUCKET + '/releases'
 RC_LOG_FORMAT = '%s_log.json'
 RC_ZIP_FORMAT = 'chromedriver_%s_%s_%s.zip'
 RC_ZIP_GLOB = 'chromedriver_%s_%s_*'
 RELEASE_ZIP_FORMAT = 'chromedriver_%s_%s.zip'
 
 SCRIPT_DIR = os.path.join(_THIS_DIR, os.pardir, os.pardir, os.pardir, os.pardir,
                           os.pardir, os.pardir, os.pardir, 'scripts')
 SITE_CONFIG_DIR = os.path.join(_THIS_DIR, os.pardir, os.pardir, os.pardir,
                                os.pardir, os.pardir, os.pardir, os.pardir,
                                'site_config')
 sys.path.append(SCRIPT_DIR)
 sys.path.append(SITE_CONFIG_DIR)
 from slave import gsutil_download
 from slave import slave_utils
 
 
 def ArchivePrebuilts(revision):
   """Uploads the prebuilts to google storage."""
   util.MarkBuildStepStart('archive')
-  prebuilts = ['chromedriver2_server',
-               'chromedriver2_unittests', 'chromedriver2_tests']
+  prebuilts = ['chromedriver',
+               'chromedriver_unittests', 'chromedriver_tests']
   build_dir = chrome_paths.GetBuildDir(prebuilts[0:1])
   zip_name = '%s_r%s.zip' % (GS_ZIP_PREFIX, revision)
   temp_dir = util.MakeTempDir()
   zip_path = os.path.join(temp_dir, zip_name)
   print 'Zipping prebuilts %s' % zip_path
   f = zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED)
   for prebuilt in prebuilts:
     f.write(os.path.join(build_dir, prebuilt), prebuilt)
   f.close()
   if slave_utils.GSUtilCopyFile(zip_path, GS_ARCHIVE_BUCKET):
     util.MarkBuildStepError()
 
 
 def DownloadPrebuilts():
   """Downloads the most recent prebuilts from google storage."""
   util.MarkBuildStepStart('Download chromedriver prebuilts')
 
   temp_dir = util.MakeTempDir()
-  zip_path = os.path.join(temp_dir, 'chromedriver2_prebuilts.zip')
+  zip_path = os.path.join(temp_dir, 'chromedriver_prebuilts.zip')
   if gsutil_download.DownloadLatestFile(GS_ARCHIVE_BUCKET, GS_ZIP_PREFIX,
                                         zip_path):
     util.MarkBuildStepError()
 
   build_dir = chrome_paths.GetBuildDir(['host_forwarder'])
   print 'Unzipping prebuilts %s to %s' % (zip_path, build_dir)
   f = zipfile.ZipFile(zip_path, 'r')
   f.extractall(build_dir)
   f.close()
   # Workaround for Python bug: http://bugs.python.org/issue15795
-  os.chmod(os.path.join(build_dir, 'chromedriver2_server'), 0700)
+  os.chmod(os.path.join(build_dir, 'chromedriver'), 0700)
 
 
 def GetDownloads():
   """Gets the chromedriver google code downloads page."""
   result, output = slave_utils.GSUtilListBucket(GS_RELEASE_PATH + '/*', ['-l'])
   if result:
     return ''
   return output
 
 
@@ skipping 173 matching lines @@
     print 'Android tests passed at revision %s' % revision
     Release(platform, revision)
   else:
     print 'Android tests have not run at a revision as recent as %s' % revision
 
 
 def _ConstructReleaseCandidate(platform, revision):
   """Constructs a release candidate zip from the current build."""
   zip_name = RC_ZIP_FORMAT % (platform, GetVersion(), revision)
   if util.IsWindows():
-    server_orig_name = 'chromedriver2_server.exe'
     server_name = 'chromedriver.exe'
   else:
-    server_orig_name = 'chromedriver2_server'
     server_name = 'chromedriver'
-  server = os.path.join(chrome_paths.GetBuildDir([server_orig_name]),
-                        server_orig_name)
+  server = os.path.join(chrome_paths.GetBuildDir([server_name]), server_name)
 
   print 'Zipping ChromeDriver server', server
   temp_dir = util.MakeTempDir()
   zip_path = os.path.join(temp_dir, zip_name)
   f = zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED)
   f.write(server, server_name)
   f.close()
   return zip_path
 
 
@@ skipping 133 matching lines @@
 
   if platform == 'android':
     UpdateTestResultsLog(platform, options.revision, passed)
   elif passed:
     _MaybeUpdateReleaseCandidate(platform, options.revision)
     _MaybeRelease(platform)
 
 
 if __name__ == '__main__':
   main()