Archive dartium on android builds

tools/bots/dartium_android.py

 #!/usr/bin/python
 # Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 """
 Dartium on Android buildbot steps.
 
 Runs steps after the buildbot builds Dartium on Android,
 which should upload the APK to an attached device, and run
 Dart and chromium tests on it.
 """
 
+import optparse
+import os
 import sys
-import optparse
+
+import bot
+import bot_utils
+
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+sys.path.append(os.path.join(SCRIPT_DIR, '..'))
+import utils
+
+
+APK_LOCATION = 'apks/Chrome.apk'

[kustermann, 2014/03/06 09:20:36]

Please also archive ContentShell.apk (I think it should be there).

[ricow1, 2014/03/06 11:49:05]

We do have it - added

 
 def GetOptionsParser():
   parser = optparse.OptionParser("usage: %prog [options]")
   parser.add_option("--build-products-dir",
                     help="The directory containing the products of the build.")
   return parser
 
+def UploadAPK(options):
+  with bot.BuildStep('Upload apk'):
+    revision = utils.GetSVNRevision()
+    namer = bot_utils.GCSNamer()
+    gsutil = bot_utils.GSUtil()
+    local_path = os.path.join(options.build_products_dir, APK_LOCATION)
+    gs_path = namer.dartium_android_apk_filepath(revision)
+    gsutil.upload(local_path, gs_path)
+    gsutil.setGroupReadACL(gs_path, 'google.com')
+    gsutil.setContentType(gs_path, 'application/vnd.android.package-archive')
+
 def main():
   if sys.platform != 'linux2':
     print "This script was only tested on linux. Please run it on linux!"
     sys.exit(1)
 
   parser = GetOptionsParser()
   (options, args) = parser.parse_args()
 
   if not options.build_products_dir:
     die("No build products directory given.")

[kustermann, 2014/03/06 09:20:36]

Where is "die" comming from? Maybe you need to do bot_utils.die() [I don't know
where "die" is]

[ricow1, 2014/03/06 11:49:05]

Fixed up, I don't know when this landed

+  UploadAPK(options)
   sys.exit(0)
 
 if __name__ == '__main__':
   main()