| OLD | NEW |
| 1 #!/usr/bin/python | 1 #!/usr/bin/python |
| 2 # Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 2 # Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 3 # for details. All rights reserved. Use of this source code is governed by a | 3 # for details. All rights reserved. Use of this source code is governed by a |
| 4 # BSD-style license that can be found in the LICENSE file. | 4 # BSD-style license that can be found in the LICENSE file. |
| 5 | 5 |
| 6 """ | 6 """ |
| 7 Dartium on Android buildbot steps. | 7 Dartium on Android buildbot steps. |
| 8 | 8 |
| 9 Runs steps after the buildbot builds Dartium on Android, | 9 Runs steps after the buildbot builds Dartium on Android, |
| 10 which should upload the APK to an attached device, and run | 10 which should upload the APK to an attached device, and run |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 def UploadSetACL(gsutil, local, remote): | 37 def UploadSetACL(gsutil, local, remote): |
| 38 gsutil.upload(local, remote) | 38 gsutil.upload(local, remote) |
| 39 gsutil.setGroupReadACL(remote, 'google.com') | 39 gsutil.setGroupReadACL(remote, 'google.com') |
| 40 gsutil.setContentType(remote, 'application/vnd.android.package-archive') | 40 gsutil.setContentType(remote, 'application/vnd.android.package-archive') |
| 41 | 41 |
| 42 | 42 |
| 43 def UploadAPKs(options): | 43 def UploadAPKs(options): |
| 44 with bot.BuildStep('Upload apk'): | 44 with bot.BuildStep('Upload apk'): |
| 45 revision = utils.GetSVNRevision() | 45 revision = utils.GetSVNRevision() |
| 46 namer = bot_utils.GCSNamer(internal=True) | 46 namer = bot_utils.GCSNamer(internal=True) |
| 47 # The version of gsutil we have on the bots is not new enough to support |
| 48 # the acl set commands. |
| 49 bot_utils.GSUtil.USE_DART_REPO_VERSION = True |
| 47 gsutil = bot_utils.GSUtil() | 50 gsutil = bot_utils.GSUtil() |
| 48 | 51 |
| 49 | |
| 50 # Archive dartuim | 52 # Archive dartuim |
| 51 local = os.path.join(options.build_products_dir, APK_LOCATION) | 53 local = os.path.join(options.build_products_dir, APK_LOCATION) |
| 52 # TODO(whesse): pass in arch and mode from reciepe | 54 # TODO(whesse): pass in arch and mode from reciepe |
| 53 remote = namer.dartium_android_apk_filepath(revision, | 55 remote = namer.dartium_android_apk_filepath(revision, |
| 54 'dartium-android', | 56 'dartium-android', |
| 55 'arm', | 57 'arm', |
| 56 'release') | 58 'release') |
| 57 web_link_prefix = 'https://storage.cloud.google.com/' | 59 web_link_prefix = 'https://storage.cloud.google.com/' |
| 58 dartium_link = string.replace(remote, 'gs://', web_link_prefix) | 60 dartium_link = string.replace(remote, 'gs://', web_link_prefix) |
| 59 UploadSetACL(gsutil, local, remote) | 61 UploadSetACL(gsutil, local, remote) |
| (...skipping 20 matching lines...) Expand all Loading... |
| 80 | 82 |
| 81 if not options.build_products_dir: | 83 if not options.build_products_dir: |
| 82 print "No build products directory given." | 84 print "No build products directory given." |
| 83 sys.exit(1) | 85 sys.exit(1) |
| 84 | 86 |
| 85 UploadAPKs(options) | 87 UploadAPKs(options) |
| 86 sys.exit(0) | 88 sys.exit(0) |
| 87 | 89 |
| 88 if __name__ == '__main__': | 90 if __name__ == '__main__': |
| 89 main() | 91 main() |
| OLD | NEW |