Bug 1533589: [win64-aarch64] Point win64-aarch64 stub bounce entries at the correct path; r=mtabara a=tomprince DEVEDITION_67_0b8_BUILD1 FIREFOX_67_0b8_BUILD1
authorTom Prince <mozilla@hocat.ca>
Wed, 03 Apr 2019 20:33:59 +0000
changeset 525933 3e71adc4ab1dfcbabeb559613924b755391e08d1
parent 525932 3a1794991ba4fc07a69e5d75101c76826eb1aee7
child 525934 e2f09a8bd87cb38405446b594058104f0c694561
push id2032
push userffxbld-merge
push dateMon, 13 May 2019 09:36:57 +0000
treeherdermozilla-release@455c1065dcbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmtabara, tomprince
bugs1533589
milestone67.0
Bug 1533589: [win64-aarch64] Point win64-aarch64 stub bounce entries at the correct path; r=mtabara a=tomprince There was special case logic to map the win64 platform to win32, for stub entries. When win64-aarch64 was added no special case was added for that plaform, so they stub entries pointed at the incorrect place. This changes the configuration so that all stub entries point at the win32 paths, without needing special case code. Differential Revision: https://phabricator.services.mozilla.com/D25841
taskcluster/taskgraph/transforms/bouncer_submission.py
--- a/taskcluster/taskgraph/transforms/bouncer_submission.py
+++ b/taskcluster/taskgraph/transforms/bouncer_submission.py
@@ -89,17 +89,19 @@ CONFIG_PER_BOUNCER_PRODUCT = {
         'name_postfix': 'build{build_number}-Partial-{previous_version}build{previous_build}',
         'path_template': CANDIDATES_PATH_TEMPLATE,
         'file_names': {
             'default': '{product}-{previous_version}-{version}.partial.mar',
         },
     },
     'stub-installer': {
         'name_postfix': '-stub',
-        'path_template': RELEASES_PATH_TEMPLATE,
+        # We currently have a sole win32 stub installer that is to be used
+        # in all windows platforms to toggle between full installers
+        'path_template': RELEASES_PATH_TEMPLATE.replace('{ftp_platform}', 'win32'),
         'file_names': {
             'win': '{pretty_product}%20Installer.exe',
             'win64': '{pretty_product}%20Installer.exe',
             'win64-aarch64': '{pretty_product}%20Installer.exe',
         },
     },
     'msi': {
         'name_postfix': '-msi-SSL',
@@ -220,39 +222,29 @@ def craft_paths_per_bouncer_platform(pro
         )
 
         path_template = CONFIG_PER_BOUNCER_PRODUCT[bouncer_product]['path_template']
         file_relative_location = path_template.format(
             ftp_product=_craft_ftp_product(product),
             version=current_version,
             build_number=current_build_number,
             update_folder='update/' if '-mar' in bouncer_product else '',
-            ftp_platform=_craft_ftp_platform(bouncer_platform, file_name),
+            ftp_platform=FTP_PLATFORMS_PER_BOUNCER_PLATFORM[bouncer_platform],
             file=file_name,
         )
 
         paths_per_bouncer_platform[bouncer_platform] = file_relative_location
 
     return paths_per_bouncer_platform
 
 
 def _craft_ftp_product(product):
     return 'mobile' if product == 'fennec' else product.lower()
 
 
-def _craft_ftp_platform(bouncer_platform, file_name):
-    ftp_platform = FTP_PLATFORMS_PER_BOUNCER_PLATFORM[bouncer_platform]
-    # We currently have a sole win32 stub installer that is to be used
-    # in both windows platforms to toggle between full installers
-    if 'Installer.exe' in file_name and ftp_platform == 'win64':
-        return 'win32'
-
-    return ftp_platform
-
-
 def _craft_filename_product(product):
     return 'firefox' if product == 'devedition' else product
 
 
 @attr.s
 class InvalidSubstitution(object):
     error = attr.ib(type=str)