Archive dartium on android builds

tools/bots/bot_utils.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012, 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.
 
 import hashlib
 import imp
 import os
 import subprocess
@@ skipping 70 matching lines @@
     - /editor-eclipse-update
          /{index.html,features/,plugins/,artifacts.jar,content.jar}
   """
   def __init__(self, channel=Channel.BLEEDING_EDGE,
       release_type=ReleaseType.RAW):
     assert channel in Channel.ALL_CHANNELS
     assert release_type in ReleaseType.ALL_TYPES
 
     self.channel = channel
     self.release_type = release_type
     self.bucket = 'gs://dart-archive'

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

I'd make a named parameter to the constructor to specify the bucket, make
'gs://dart-archive' the default. Then we could have an internal
'gs://dart-archive-internal' bucket.

Maybe making a GCSInternalNamer subclass of GCSNamer would be better.

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

I am taking a optional parameter - internal - to swithc on

 
   # Functions for quering complete gs:// filepaths
 
   def version_filepath(self, revision):
     return '%s/channels/%s/%s/%s/VERSION' % (self.bucket, self.channel,
         self.release_type, revision)
 
   def editor_zipfilepath(self, revision, system, arch):
     return '/'.join([self.editor_directory(revision),
       self.editor_zipfilename(system, arch)])
 
   def editor_installer_filepath(self, revision, system, arch, extension):
     return '/'.join([self.editor_directory(revision),
       self.editor_installer_filename(system, arch, extension)])
 
   def sdk_zipfilepath(self, revision, system, arch, mode):
     return '/'.join([self.sdk_directory(revision),
       self.sdk_zipfilename(system, arch, mode)])
 
   def dartium_variant_zipfilepath(self, revision, name, system, arch, mode):
     return '/'.join([self.dartium_directory(revision),
       self.dartium_variant_zipfilename(name, system, arch, mode)])
 
   def apidocs_zipfilepath(self, revision):
     return '/'.join([self.apidocs_directory(revision),
       self.apidocs_zipfilename()])
 
+  def dartium_android_apk_filepath(self, revision):
+    return '/'.join([self.dartium_android_directory(revision),
+      self.dartium_android_apk_filename()])
+
   # Functions for querying gs:// directories
 
   def dartium_directory(self, revision):
     return self._variant_directory('dartium', revision)
 
+  def dartium_android_directory(self, revision):
+    return self._variant_directory('dartium_android', revision)
+
   def sdk_directory(self, revision):
     return self._variant_directory('sdk', revision)
 
   def editor_directory(self, revision):
     return self._variant_directory('editor', revision)
 
   def editor_eclipse_update_directory(self, revision):
     return self._variant_directory('editor-eclipse-update', revision)
 
   def apidocs_directory(self, revision):
     return self._variant_directory('api-docs', revision)
 
   def misc_directory(self, revision):
     return self._variant_directory('misc', revision)
 
   def _variant_directory(self, name, revision):
     return '%s/channels/%s/%s/%s/%s' % (self.bucket, self.channel,
         self.release_type, revision, name)
 
   # Functions for quering filenames
 
+  def dartium_android_apk_filename(self):
+    return 'Chrome.apk'

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

I'd prefer if we can differentiate between release/debug, arm/arm64. Just do it
like we do for normal dartium, i.e.:

.../dartium/dartium-android-arm-release.apk
.../dartium/content_shell-android-arm-debug.apk

I.e. use the functionality in "dartium_variant_zipfilename"

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

valid point, I will add that

+
   def apidocs_zipfilename(self):
     return 'dart-api-docs.zip'
 
   def editor_zipfilename(self, system, arch):
     return 'darteditor-%s-%s.zip' % (
         SYSTEM_RENAMES[system], ARCH_RENAMES[arch])
 
   def editor_installer_filename(self, system, arch, extension):
     assert extension in ['dmg', 'msi']
     return 'darteditor-installer-%s-%s.%s' % (
@@ skipping 87 matching lines @@
     assert remote_path.startswith('gs://')
 
     args = ['cp']
     if public:
       args += ['-a', 'public-read']
     if recursive:
       args += ['-R']
     args += [local_path, remote_path]
     self.execute(args)
 
+  def setGroupReadACL(self, remote_path, group):
+    args = ['acl', 'ch', '-g', '%s:R' % group, remote_path]
+    self.execute(args)
+
+  def setContentType(self, remote_path, content_type):
+    args = ['setmeta', '-h', 'Content-Type:%s' % content_type, remote_path]
+    self.execute(args)
+
   def remove(self, remote_path, recursive=False):
     assert remote_path.startswith('gs://')
 
     args = ['rm']
     if recursive:
       args += ['-R']
     args += [remote_path]
     self.execute(args)
 
 def CalculateChecksum(filename):
@@ skipping 14 matching lines @@
   if not mangled_filename:
     mangled_filename = os.path.basename(filename)
 
   checksum = CalculateChecksum(filename)
   checksum_filename = '%s.md5sum' % filename
 
   with open(checksum_filename, 'w') as f:
     f.write('%s *%s' % (checksum, mangled_filename))
 
   return checksum_filename