Bug 1244298 - Download android-api-15 artifacts. r?ahunt draft
authorNick Alexander <nalexander@mozilla.com>
Mon, 01 Feb 2016 10:30:36 -0800
changeset 327744 c2ef5e2d213982a07200ceca7edf9d1626b3c5f9
parent 327743 20a1b9d469bb71606ceea29a9e4dcf3b54e1197e
child 513736 2602d8fc383aab8e33d066316af95ca5a70ed31e
push id10278
push usernalexander@mozilla.com
push dateMon, 01 Feb 2016 18:30:52 +0000
reviewersahunt
bugs1244298
milestone47.0a1
Bug 1244298 - Download android-api-15 artifacts. r?ahunt
python/mozbuild/mozbuild/artifacts.py
python/mozbuild/mozbuild/mach_commands.py
--- a/python/mozbuild/mozbuild/artifacts.py
+++ b/python/mozbuild/mozbuild/artifacts.py
@@ -372,17 +372,17 @@ class WinArtifactJob(ArtifactJob):
                                  patterns=self.artifact_patterns))
 
 # Keep the keys of this map in sync with the |mach artifact| --job
 # options.  The keys of this map correspond to entries at
 # https://tools.taskcluster.net/index/artifacts/#buildbot.branches.mozilla-central/buildbot.branches.mozilla-central.
 # The values correpsond to a pair of (<package regex>, <test archive regex>).
 JOB_DETAILS = {
     # 'android-api-9': (AndroidArtifactJob, 'public/build/fennec-(.*)\.android-arm\.apk'),
-    'android-api-11': (AndroidArtifactJob, ('public/build/fennec-(.*)\.android-arm\.apk',
+    'android-api-15': (AndroidArtifactJob, ('public/build/fennec-(.*)\.android-arm\.apk',
                                             None)),
     'android-x86': (AndroidArtifactJob, ('public/build/fennec-(.*)\.android-i386\.apk',
                                          None)),
     'linux': (LinuxArtifactJob, ('public/build/firefox-(.*)\.linux-i686\.tar\.bz2',
                                  'public/build/firefox-(.*)\.common\.tests\.zip')),
     'linux64': (LinuxArtifactJob, ('public/build/firefox-(.*)\.linux-x86_64\.tar\.bz2',
                                    'public/build/firefox-(.*)\.common\.tests\.zip')),
     'macosx64': (MacArtifactJob, ('public/build/firefox-(.*)\.mac\.dmg',
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -1402,17 +1402,17 @@ class MachDebug(MachCommandBase):
                     return list(obj)
                 return json.JSONEncoder.default(self, obj)
         json.dump(self, cls=EnvironmentEncoder, sort_keys=True, fp=out)
 
 class ArtifactSubCommand(SubCommand):
     def __call__(self, func):
         after = SubCommand.__call__(self, func)
         jobchoices = {
-            'android-api-11',
+            'android-api-15',
             'android-x86',
             'linux',
             'linux64',
             'macosx64',
             'win32',
             'win64'
         }
         args = [
@@ -1475,17 +1475,17 @@ class PackageFrontend(MachCommandBase):
         return artifacts
 
     def _compute_platform(self, job=None):
         if job:
             return job
         if self.substs.get('MOZ_BUILD_APP', '') == 'mobile/android':
             if self.substs['ANDROID_CPU_ARCH'] == 'x86':
                 return 'android-x86'
-            return 'android-api-11'
+            return 'android-api-15'
         # TODO: check for 32/64 bit builds.  We'd like to use HAVE_64BIT_BUILD
         # but that relies on the compile environment.
         if self.defines.get('XP_LINUX', False):
             return 'linux64'
         if self.defines.get('XP_MACOSX', False):
             return 'macosx64'
         if self.defines.get('XP_WIN', False):
             return 'win32'