Bug 1192064 - Add 'android-x86' job to |mach artifact|. r=jonalmeida
authorNick Alexander <nalexander@mozilla.com>
Fri, 23 Oct 2015 12:55:16 -0700
changeset 304505 48711da1e0658f9b533e2e45f50b9e90199016c5
parent 304504 ebe762936d7aa9d7b3bdb586d6ff99b4196488d8
child 304506 599cddea4a027034f05a3b99c8050c592a7241c8
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjonalmeida
bugs1192064
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1192064 - Add 'android-x86' job to |mach artifact|. r=jonalmeida
mobile/android/mach_commands.py
python/mozbuild/mozbuild/artifacts.py
--- a/mobile/android/mach_commands.py
+++ b/mobile/android/mach_commands.py
@@ -210,17 +210,17 @@ class PackageFrontend(MachCommandBase):
         artifacts = Artifacts(tree, job, log=self.log, cache_dir=cache_dir, hg=hg)
         return artifacts
 
     @SubCommand('artifact', 'install',
         'Install a good pre-built artifact.')
     @CommandArgument('--tree', metavar='TREE', type=str,
         help='Firefox tree.',
         default='fx-team')  # TODO: switch to central as this stabilizes.
-    @CommandArgument('--job', metavar='JOB', choices=['android-api-11'],
+    @CommandArgument('--job', metavar='JOB', choices=['android-api-11', 'android-x86'],
         help='Build job.',
         default='android-api-11')  # TODO: fish job from build configuration.
     @CommandArgument('source', metavar='SRC', nargs='?', type=str,
         help='Where to fetch and install artifacts from.  Can be omitted, in '
             'which case the current hg repository is inspected; an hg revision; '
             'a remote URL; or a local file.',
         default=None)
     def artifact_install(self, source=None, tree=None, job=None):
--- a/python/mozbuild/mozbuild/artifacts.py
+++ b/python/mozbuild/mozbuild/artifacts.py
@@ -74,16 +74,17 @@ MAX_CACHED_TASKS = 400  # Number of push
 MAX_CACHED_ARTIFACTS = 6
 
 # TODO: handle multiple artifacts with the same filename.
 # TODO: handle installing binaries from different types of artifacts (.tar.bz2, .dmg, etc).
 # Keep the keys of this map in sync with the |mach artifact| --job options.
 JOB_DETAILS = {
     # 'android-api-9': {'re': re.compile('public/build/fennec-(.*)\.android-arm\.apk')},
     'android-api-11': {'re': re.compile('public/build/fennec-(.*)\.android-arm\.apk')},
+    'android-x86': {'re': re.compile('public/build/fennec-(.*)\.android-i386\.apk')},
     # 'linux': {'re': re.compile('public/build/firefox-(.*)\.linux-i686\.tar\.bz2')},
     # 'linux64': {'re': re.compile('public/build/firefox-(.*)\.linux-x86_64\.tar\.bz2')},
     # 'macosx64': {'re': re.compile('public/build/firefox-(.*)\.mac\.dmg')},
 }
 
 
 def cachedmethod(cachefunc):
     '''Decorator to wrap a class or instance method with a memoizing callable that