Add simple build archiving for Mandoline binaries.

scripts/slave/recipes/chromium_mojo.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.
 
 import re
 
 from recipe_engine.types import freeze
 from recipe_engine import recipe_api
 
 DEPS = [
   'bot_update',
   'chromium',
   'chromium_android',
+  'file',
   'gsutil',
   'raw_io',
   'path',
   'platform',
   'properties',
   'python',
   'step',
 ]
 
 
@@ skipping 93 matching lines @@
   # Check if the current version is already uploaded for the given platform.
   bucket = 'mandoline'
   url = 'gs://%s/%s' % (bucket, version)
   result = api.gsutil.ls(bucket, '', stdout=api.raw_io.output())
   result.presentation.logs['ls result stdout'] = [result.stdout or '']
   if result.stdout and url in result.stdout:
     result = api.gsutil.ls(bucket, version, stdout=api.raw_io.output())
     result.presentation.logs['ls result stdout'] = [result.stdout or '']
   url = '%s/%s' % (url, api.chromium.c.TARGET_PLATFORM)
 
-  api.step('upload_mandoline', None)
   if result.stdout and url in result.stdout:
-    api.step.active_result.presentation.step_text = 'Skipping; already uploaded'
+    api.step('skipping mandoline upload: release already exits', None)
     return
 
-  path = '%s/%s' % (version, api.chromium.c.TARGET_PLATFORM)
-  name = 'Mandoline.apk'
-  local_path = api.chromium.output_dir.join('apks', name)
-  remote_path = '%s/%s' % (path, name)
-  api.gsutil.upload(local_path, bucket, remote_path)
+  # Read a limited FILES.cfg file-list format, uploading each applicable entry.
+  files = api.path['checkout'].join('mandoline', 'tools', 'data', 'FILES.cfg')
+  test_data = 'FILES=[{\'filepath\': \'foo\', \'platforms\': [\'linux\'],},]'
+  files_data = api.file.read('read FILES.cfg', files, test_data=test_data)
+  execution_globals = {}
+  exec(files_data, execution_globals)
+  gs_path = '%s/%s' % (version, api.chromium.c.TARGET_PLATFORM)
+  for file_dictionary in execution_globals['FILES']:
+    if api.chromium.c.TARGET_PLATFORM in file_dictionary['platforms']:
+      file_path = file_dictionary['filepath']
+      local_path = api.chromium.output_dir.join(file_path)
+      remote_path = '%s/%s' % (gs_path, file_path)
+      args = ['-r'] if file_dictionary.get('directory', False) else []
+      api.gsutil.upload(local_path, bucket, remote_path, args=args)
 
 
 @recipe_api.composite_step
 def _RunApptests(api):
   runner = api.path['checkout'].join('mojo', 'tools', 'apptest_runner.py')
   api.python('app_tests', runner, [api.chromium.output_dir, '--verbose'])
 
 
 def _RunUnitAndAppTests(api):
   with api.step.defer_results():
@@ skipping 62 matching lines @@
   api.chromium.compile(targets=['mandoline:all'])
 
   if api.chromium.c.TARGET_PLATFORM == 'android':
     api.chromium_android.detect_and_setup_devices()
 
   bot_config = _GetBotConfig(api)
   if bot_config.get('run_perf_tests', False):
     _RunPerfTests(api, bot_config['perf_test_info'])
   else:
     _RunUnitAndAppTests(api)
-    # TODO(msw): Upload binaries on Windows and Linux.
-    if api.chromium.c.TARGET_PLATFORM == 'android':
-      _UploadMandolineToGoogleStorage(api)
+    _UploadMandolineToGoogleStorage(api)
 
 
 def GenTests(api):
   for test in api.chromium.gen_tests_for_builders(BUILDERS):
     yield test
 
   # Ensure upload is skipped if version/platform binaries are already uploaded.
   test = api.test('test_upload_skipped_for_existing_binaries')
   test += api.platform.name('linux')
   test += api.properties.generic(buildername='Chromium Mojo Android',
                                  mastername='chromium.mojo')
   # This relies on api.chromium.get_version's hard-coded step_test_data version.
   test_ls = api.raw_io.output('gs://mandoline/37.0.2021.0/android/')
   test += api.step_data('gsutil ls gs://mandoline/', stdout=test_ls)
   test += api.step_data('gsutil ls gs://mandoline/37.0.2021.0', stdout=test_ls)
   yield test