Bug 1133074 - Make the gecko.v2 routes public; r=jlund,garndt

testing/mozharness/mozharness/mozilla/building/buildbase.py

@@ -1405,10 +1405,11 @@ or run without that action (ie: --no-{action})"
                     templates.extend(contents['l10n'])
             else:
                 templates = contents['routes']
+        index = self.config.get('taskcluster_index', 'index.garbage.staging')
         routes = []
         for template in templates:
             fmt = {
-                'index': 'index.garbage.staging.mshal-testing', # TODO
+                'index': index,
                 'project': self.buildbot_config['properties']['branch'],
                 'head_rev': self.query_revision(),
                 'build_product': self.config['stage_product'],
@@ -1427,7 +1428,6 @@ or run without that action (ie: --no-{action})"
                          self.log_obj,
                          )
 
-        index = self.config.get('taskcluster_index', 'index.garbage.staging')
         # TODO: Bug 1165980 - these should be in tree
         routes.extend([
             "%s.buildbot.branches.%s.%s" % (index, self.branch, self.stage_platform),

testing/mozharness/scripts/desktop_l10n.py

@@ -1028,9 +1028,7 @@ class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, BuildbotMixin,
             routes = []
             for template in templates:
                 fmt = {
-                    # TODO: Bug 1133074
-                    #index = self.config.get('taskcluster_index', 'index.garbage.staging')
-                    'index': 'index.garbage.staging.mshal-testing',
+                    'index': self.config.get('taskcluster_index', 'index.garbage.staging'),
                     'project': branch,
                     'head_rev': revision,
                     'build_product': self.config['stage_product'],

testing/taskcluster/mach_commands.py

@@ -287,7 +287,7 @@ class Graph(object):
 
         # Template parameters used when expanding the graph
         parameters = dict(gaia_info().items() + {
-            'index': 'index.garbage.staging.mshal-testing', #TODO
+            'index': 'index',
             'project': project,
             'pushlog_id': params.get('pushlog_id', 0),
             'docker_image': docker_image,