Support network service apptests in the upload_service script

mojo/services/upload_service.py

 #!/usr/bin/env python
 # 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 argparse
 import imp
 import os
 import subprocess
 import sys
 import tempfile
 import time
 import zipfile
 
-# A service's name is defined as the name of its subdirectory in the directory
-# containing this file.
-SERVICES = [ "network", "html_viewer" ]
+# Uploading a service (e.g. network_service) means uploading the app binary for
+# the service (network_service.mojo), possibly binaries for associated apps
+# (network_service_apptests.mojo) and a zip with the service mojoms.

[blundell, 2015/02/05 13:03:22]

mojos if any.

[ppi, 2015/02/05 13:29:07]

Done.

+SERVICES = [ "html_viewer", "network_service" ]
 
-SERVICE_BINARY_NAMES = {
-    "network" : "network_service.mojo",
-    "html_viewer" : "html_viewer.mojo"
+# The script will look for the mojoms in the subdirectory indicated here.
+SERVICE_DIRECTORIES = {
+    "html_viewer": "html_viewer",
+    "network_service": "network"
+}
+
+# Binaries for the associated apps are uploaded in lockstep with the primary
+# service (e.g. network service apptests with network service). TODO(ppi):
+# remove this once we have full apptest platform coverage in Chromium.
+ASSOCIATED_APPS = {
+    "network_service" : [ "network_service_apptests" ]
 }
 
 # The network service is downloaded out-of-band rather than dynamically by the
 # shell and thus can be stored zipped in the cloud. Other services are intended
 # to be downloaded dynamically by the shell, which doesn't currently understand
 # zipped binaries.
-SERVICES_WITH_ZIPPED_BINARIES = [ "network" ]
+SERVICES_WITH_ZIPPED_BINARIES = [ "network_service" ]
 
 if not sys.platform.startswith("linux"):
   print "Only support linux for now"
   sys.exit(1)
 
 root_path = os.path.realpath(
     os.path.join(
         os.path.dirname(
             os.path.realpath(__file__)),
         os.pardir,
@@ skipping 10 matching lines @@
 
 def gsutil_cp(source, dest, dry_run):
   if dry_run:
     print "gsutil cp %s %s" % (source, dest)
   else:
     subprocess.check_call([gsutil_exe, "cp", source, dest])
 
 
 def upload_mojoms(service, dry_run):
   script_dir = os.path.dirname(os.path.realpath(__file__))
-  service_dir = os.path.join(script_dir, service)
+  service_dir = os.path.join(script_dir, SERVICE_DIRECTORIES[service])
   absolute_mojom_directory_path = os.path.join(
       service_dir,
       "public",
       "interfaces")
 
   if not os.path.exists(absolute_mojom_directory_path):
     # This service has no interfaces.
     return
 
   dest = "gs://mojo/" + service + "/" + version + "/" + "mojoms.zip"
   with tempfile.NamedTemporaryFile() as mojom_zip_file:
     with zipfile.ZipFile(mojom_zip_file, 'w') as z:
       for root, _, files in os.walk(absolute_mojom_directory_path):
         for filename in files:
           absolute_file_path = os.path.join(root, filename)
           relative_file_path = os.path.relpath(absolute_file_path, root)
           z.write(absolute_file_path, relative_file_path)
     gsutil_cp(mojom_zip_file.name, dest, dry_run)
 
 
-def upload_binary(service, binary_dir, platform, dry_run):
-  binary_name = SERVICE_BINARY_NAMES[service]
-  absolute_binary_path = os.path.join(root_path, binary_dir, binary_name)
-  binary_dest_prefix = "gs://mojo/" + service + "/" + version + "/" + platform
+def upload_service(service, binary_dir, platform, dry_run):

[blundell, 2015/02/05 13:03:22]

s/upload_service/upload_apps? I would expect a function called 'upload_service'
to also upload the mojoms.

[ppi, 2015/02/05 13:29:06]

Done.

+  apps = [ service ] + ASSOCIATED_APPS.get(service, [])
+  should_zip = service in SERVICES_WITH_ZIPPED_BINARIES
 
-  if service not in SERVICES_WITH_ZIPPED_BINARIES:
-    binary_dest = binary_dest_prefix + "/" + binary_name
-    gsutil_cp(absolute_binary_path, binary_dest, dry_run)
+  for app in apps:
+    dest_dir = "gs://mojo/" + app + "/" + version + "/" + platform + "/"
+    binary_name = app + ".mojo"
+    absolute_binary_path = os.path.join(root_path, binary_dir, binary_name)
+    upload_binary(absolute_binary_path, binary_name, dest_dir, should_zip,
+                  dry_run)
+
+def upload_binary(absolute_binary_path, binary_name, dest_dir, should_zip,
+                  dry_run):
+  if not should_zip:
+    dest = dest_dir + binary_name
+    gsutil_cp(absolute_binary_path, dest, dry_run)
     return
 
   # Zip the binary before uploading it to the cloud.
-  binary_dest = binary_dest_prefix + ".zip"
+  dest = dest_dir + binary_name + ".zip"
   with tempfile.NamedTemporaryFile() as binary_zip_file:
     with zipfile.ZipFile(binary_zip_file, 'w') as z:
       with open(absolute_binary_path) as service_binary:
         zipinfo = zipfile.ZipInfo(binary_name)
         zipinfo.external_attr = 0o777 << 16
         zipinfo.compress_type = zipfile.ZIP_DEFLATED
         zipinfo.date_time = time.gmtime(os.path.getmtime(absolute_binary_path))
         z.writestr(zipinfo, service_binary.read())
-    gsutil_cp(binary_zip_file.name, binary_dest, dry_run)
+    gsutil_cp(binary_zip_file.name, dest, dry_run)
 
 
 def main():
   parser = argparse.ArgumentParser(
       description="Upload service mojoms and binaries to Google storage")
   parser.add_argument("-n", "--dry-run", action="store_true", help="Dry run")
   parser.add_argument(
       "--linux-x64-binary-dir",
       help="Path to the dir containing the linux-x64 service binary relative "
            "to the repo root, e.g. out/Release")
   parser.add_argument(
       "--android-arm-binary-dir",
       help="Path to the dir containing the android-arm service binary relative "
            "to the repo root, e.g. out/android_Release")
   parser.add_argument("service",
                       help="The service to be uploaded (one of %s)" % SERVICES)
 
   args = parser.parse_args()
 
   if args.service not in SERVICES:
     print args.service + " is not one of the recognized services:"
     print SERVICES
     return 1
 
   upload_mojoms(args.service, args.dry_run)
   if args.linux_x64_binary_dir:
-    upload_binary(args.service, args.linux_x64_binary_dir,
-                  "linux-x64", args.dry_run)
+    upload_service(args.service, args.linux_x64_binary_dir,
+                    "linux-x64", args.dry_run)

[blundell, 2015/02/05 13:03:22]

nit: indentation, here and in the corresponding line below.

[ppi, 2015/02/05 13:29:07]

Done.

   if args.android_arm_binary_dir:
-    upload_binary(args.service, args.android_arm_binary_dir,
-                  "android-arm", args.dry_run)
+    upload_service(args.service, args.android_arm_binary_dir,
+                    "android-arm", args.dry_run)
 
   if not args.dry_run:
     print "Uploaded artifacts for version %s" % (version, )
   else:
     print "No artifacts uploaded (dry run)"
   return 0
 
 if __name__ == '__main__':
   sys.exit(main())