Bug 1352113 - Shippable Builds - Update index routes for shippable. Try to be backwards compat where possible. r=aki
☠☠ backed out by aea38cfc632a ☠ ☠
authorJustin Wood <Callek@gmail.com>
Tue, 26 Mar 2019 02:10:53 +0000
changeset 466161 4b9413d05816c6db9779f1c3165c9a6f4f7d3d06
parent 466160 3e2b6a495e8cc4582d7ce41302a4a483cadd4c08
child 466162 4943b23813fe56a358febd1617e51937afc6943f
push id35762
push usercsabou@mozilla.com
push dateWed, 27 Mar 2019 04:44:00 +0000
treeherdermozilla-central@bc572aee49b6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaki
bugs1352113
milestone68.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 1352113 - Shippable Builds - Update index routes for shippable. Try to be backwards compat where possible. r=aki Differential Revision: https://phabricator.services.mozilla.com/D24829
taskcluster/taskgraph/transforms/repackage_routes.py
taskcluster/taskgraph/transforms/task.py
--- a/taskcluster/taskgraph/transforms/repackage_routes.py
+++ b/taskcluster/taskgraph/transforms/repackage_routes.py
@@ -20,17 +20,17 @@ def add_indexes(config, jobs):
             build_platform = job['attributes']['build_platform']
             job_name = '{}-{}'.format(build_platform, repackage_type)
             product = job.get('index', {}).get('product', 'firefox')
             index_type = 'generic'
             if job['attributes'].get('shippable') and job['attributes'].get('locale'):
                 index_type = 'shippable-l10n'
             if job['attributes'].get('nightly') and job['attributes'].get('locale'):
                 index_type = 'nightly-l10n'
-            if job['attributes'].get('nightly'):
+            if job['attributes'].get('shippable'):
                 index_type = 'shippable'
             if job['attributes'].get('nightly'):
                 index_type = 'nightly'
             if job['attributes'].get('locale'):
                 index_type = 'l10n'
             job['index'] = {
                 'job-name': job_name,
                 'product': product,
--- a/taskcluster/taskgraph/transforms/task.py
+++ b/taskcluster/taskgraph/transforms/task.py
@@ -1492,17 +1492,18 @@ def add_shippable_index_routes(config, t
 
     for tpl in V2_SHIPPABLE_TEMPLATES:
         routes.append(tpl.format(**subs))
 
     # Also add routes for en-US
     task = add_shippable_l10n_index_routes(config, task, force_locale="en-US")
 
     # For nightly-compat index:
-    # 'nightly' in config.params['target_tasks_method']
+    if 'nightly' in config.params['target_tasks_method']:
+        add_nightly_index_routes(config, task)
 
     return task
 
 
 @index_builder('release')
 def add_release_index_routes(config, task):
     index = task.get('index')
     routes = []
@@ -1604,16 +1605,20 @@ def add_shippable_l10n_index_routes(conf
     # See Bug 1323792
     if len(locales) > 18:  # 18 * 3 = 54, max routes = 64
         return task
 
     for locale in locales:
         for tpl in V2_SHIPPABLE_L10N_TEMPLATES:
             routes.append(tpl.format(locale=locale, **subs))
 
+    # For nightly-compat index:
+    if 'nightly' in config.params['target_tasks_method']:
+        add_nightly_l10n_index_routes(config, task, force_locale)
+
     return task
 
 
 @index_builder('nightly-l10n')
 def add_nightly_l10n_index_routes(config, task, force_locale=None):
     index = task.get('index')
     routes = task.setdefault('routes', [])