bug 1366034: make balrog submission tools support old id builds. r=rail/aki
authorBen Hearsum <bhearsum@mozilla.com>
Thu, 18 May 2017 16:27:49 -0400
changeset 7534 37686354b95d
parent 7533 0a1586aa44d4
child 7535 be1af34adfdd
push id5605
push userbhearsum@mozilla.com
push dateThu, 18 May 2017 20:28:03 +0000
reviewersrail, aki
bugs1366034
bug 1366034: make balrog submission tools support old id builds. r=rail/aki
lib/python/balrog/submitter/cli.py
lib/python/release/platforms.py
--- a/lib/python/balrog/submitter/cli.py
+++ b/lib/python/balrog/submitter/cli.py
@@ -274,21 +274,21 @@ class NightlySubmitterBase(object):
             'platformVersion': extVersion,
             'displayVersion': appVersion,
         }
         if isOSUpdate:
             data['isOSUpdate'] = isOSUpdate
 
         data.update(self._get_update_data(productName, branch, **updateKwargs))
 
-        if platform == 'android-api-9':
-            # Bug 1080749 - a hack to support api-9 and api-10+ split builds.
+        if 'old-id' in platform:
+            # bug 1366034: support old-id builds
             # Like 1055305, this is a hack to support two builds with same build target that
             # require differed't release blobs and rules
-            build_type = 'api-9-%s' % self.build_type
+            build_type = 'old-id-%s' % self.build_type
         else:
             build_type = self.build_type
 
         name = get_nightly_blob_name(productName, branch, build_type, buildID,
                                      self.dummy)
         api = SingleLocale(name=name, build_target=build_target, locale=locale,
                            auth=self.auth, api_root=self.api_root)
 
--- a/lib/python/release/platforms.py
+++ b/lib/python/release/platforms.py
@@ -16,20 +16,21 @@ ftp_platform_map = {'win32': 'win32', 'w
                     'android-xul': 'android-xul'}
 # buildbot -> shipped-locales platform mapping
 # TODO: make sure 'win64' is correct when shipped-locales becomes aware of it
 sl_platform_map = {'win32': 'win32', 'win64': 'win32', 'macosx': 'osx',
                    'linux': 'linux', 'linux64': 'linux', 'macosx64': 'osx'}
 # buildbot -> update platform mapping
 update_platform_map = {
     'android': ['Android_arm-eabi-gcc3'],
-    'android-api-9': ['Android_arm-eabi-gcc3'],
     'android-api-11': ['Android_arm-eabi-gcc3'],
     'android-api-15': ['Android_arm-eabi-gcc3'],
+    'android-api-15-old-id': ['Android_arm-eabi-gcc3'],
     'android-x86': ['Android_x86-gcc3'],
+    'android-x86-old-id': ['Android_x86-gcc3'],
     'linux': ['Linux_x86-gcc3'],
     'linux64': ['Linux_x86_64-gcc3'],
     'macosx64': ['Darwin_x86_64-gcc3-u-i386-x86_64',  # The main platofrm
                  'Darwin_x86-gcc3-u-i386-x86_64',
                 # We don't ship builds with these build targets, but some users
                 # modify their builds in a way that has them report like these.
                 # See bug 1071576 for details.
                  'Darwin_x86-gcc3', 'Darwin_x86_64-gcc3'],