Don't put revision as part of the local filename.

scripts/slave/recipes/chromium_codesearch.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.
 
 from infra.libs.infra_types import freeze
 
 DEPS = [
   'bot_update',
   'chromium',
   'commit_position',
@@ skipping 119 matching lines @@
                           **bot_config.get('chromium_config_kwargs', {}))
   api.chromium.runhooks()
   targets = bot_config.get('compile_targets', [])
   debug_path = api.path['checkout'].join('out', api.chromium.c.BUILD_CONFIG)
   command = ['ninja', '-C', debug_path] + list(targets)
   # Add the parameters for creating the compilation database.
   command += ['-t', 'compdb', 'cc', 'cxx', 'objc', 'objcxx']
   result = api.step('generate compilation database', command,
                     stdout=api.raw_io.output())
 
-  api.chromium.compile(targets, force_clobber=True)
+  api.chromium.compile(targets)
 
   # Copy the created output to the correct directory. When running the clang
   # tool, it is assumed by the scripts that the compilation database is in the
   # out/Debug directory, and named 'compile_commands.json'.
   api.step('copy compilation database',
            ['cp', api.raw_io.input(data=result.stdout),
             debug_path.join('compile_commands.json')])
 
   # Now compile the code for real.
   if bot_config.get('create_index_pack'):
@@ skipping 18 matching lines @@
       # For some files, the clang tool produces errors. This is a known issue,
       # but since it only affects very few files (currently 9), we ignore these
       # errors for now. At least this means we can already have cross references
       # support for the files where it works.
       api.step.active_result.presentation.step_text = f.reason_message()
 
     # Create the index pack
     got_revision_cp = api.chromium.build_properties.get('got_revision_cp')
     commit_position = api.commit_position.parse_revision(got_revision_cp)
     platform = bot_config.get('platform', 'linux')
-    index_pack_name = 'index_pack_%s_%s.zip' % (platform, commit_position)
+    index_pack_name = 'index_pack_%s.zip' % platform
+    index_pack_name_with_revision = 'index_pack_%s_%s.zip' % (
+        platform, commit_position)
     api.python('create index pack',
                api.path['build'].join('scripts', 'slave', 'chromium',
                                       'package_index.py'),
                ['--path-to-compdb', debug_path.join('compile_commands.json'),
                 '--path-to-archive-output', debug_path.join(index_pack_name)])
 
     # Remove the llvm-build directory, so that gclient runhooks will download
     # the pre-built clang binary and not use the locally compiled binary from
     # the 'compile translation_unit clang tool' step.
     api.path.rmtree('llvm-build',
                     api.path['checkout'].join('third_party', 'llvm-build'))
 
     # Upload the index pack
     environment = bot_config.get('environment', 'prod')
     api.gsutil.upload(
         name='upload index pack',
         source=debug_path.join(index_pack_name),
         bucket=BUCKET_NAME,
-        dest='%s/%s' % (environment, index_pack_name)
+        dest='%s/%s' % (environment, index_pack_name_with_revision)
     )
 
     # Package the source code.
-    tarball_name = 'chromium_src_%s_%s.tar.bz2' % (platform, commit_position)
+    tarball_name = 'chromium_src_%s.tar.bz2' % platform
+    tarball_name_with_revision = 'chromium_src_%s_%s.tar.bz2' % (
+        platform,commit_position)
     api.python('archive source',
                api.path['build'].join('scripts','slave',
                                       'archive_source_codesearch.py'),
                ['src', 'build', 'infra', 'tools', '/usr/include', '-f',
                 tarball_name])
 
     # Upload the source code.
     api.gsutil.upload(
         name='upload source tarball',
         source=api.path['slave_build'].join(tarball_name),
         bucket=BUCKET_NAME,
-        dest='%s/%s' % (environment, tarball_name)
+        dest='%s/%s' % (environment, tarball_name_with_revision)
     )
   else:
     # Run the package_source.py script that creates and uploads the source
     # archive which also includes the .index files generated by the
     # clang_indexer. The script inspects factory properties, so the options are
     # provided in this format.
     fake_factory_properties = {
         'package_filename': bot_config.get('package_filename', ''),
     }
     args = [
@@ skipping 25 matching lines @@
 
   yield (
     api.test(
         'full_%s_fail' % _sanitize_nonalpha('ChromiumOS Codesearch Staging')) +
     api.step_data('generate compilation database',
                   stdout=api.raw_io.output('some compilation data')) +
     api.step_data('run translation_unit clang tool', retcode=2) +
     api.properties.generic(buildername='ChromiumOS Codesearch Staging',
                            mastername='chromium.fyi')
   )