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

--HG--
extra : moz-landing-system : lando

taskcluster/taskgraph/transforms/repackage_routes.py

@@ -25,7 +25,7 @@ def add_indexes(config, jobs):
                 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'

taskcluster/taskgraph/transforms/task.py

@@ -1497,7 +1497,8 @@ def add_shippable_index_routes(config, task):
     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
 
@@ -1609,6 +1610,10 @@ def add_shippable_l10n_index_routes(config, task, force_locale=None):
         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