Backed out changeset 7478b9959a51 (bug 1341352) at developer's request a=backout
authorWes Kocher <wkocher@mozilla.com>
Tue, 28 Feb 2017 17:54:58 -0800
changeset 394162 3cb6398d924bbdf2d5596f2c49cabee743a3da0d
parent 394161 7478b9959a51ae19c4efaf6b701aedb74042a124
child 394163 e35efb0da85ffbf8ad02f9bd1765e3557db302ed
push id1468
push userasasaki@mozilla.com
push dateMon, 05 Jun 2017 19:31:07 +0000
treeherdermozilla-release@0641fc6ee9d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1341352
milestone54.0a1
backs out7478b9959a51ae19c4efaf6b701aedb74042a124
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
Backed out changeset 7478b9959a51 (bug 1341352) at developer's request a=backout MozReview-Commit-ID: KqOIgSLg2I4
taskcluster/taskgraph/transforms/balrog.py
taskcluster/taskgraph/util/scriptworker.py
--- a/taskcluster/taskgraph/transforms/balrog.py
+++ b/taskcluster/taskgraph/transforms/balrog.py
@@ -4,18 +4,17 @@
 """
 Transform the beetmover task into an actual task description.
 """
 
 from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.base import TransformSequence
 from taskgraph.util.schema import validate_schema
-from taskgraph.util.scriptworker import (get_balrog_server_scope,
-                                         get_balrog_channel_scopes)
+from taskgraph.util.scriptworker import get_balrog_server_scope
 from taskgraph.transforms.task import task_description_schema
 from voluptuous import Schema, Any, Required, Optional
 
 
 # Voluptuous uses marker objects as dictionary *keys*, but they are not
 # comparable, so we cast all of the keys back to regular strings
 task_description_schema = {str(k): v for k, v in task_description_schema.schema.iteritems()}
 
@@ -88,28 +87,26 @@ def make_task_description(config, jobs):
             "taskId": {"task-reference": "<beetmover>"},
             "taskType": "beetmover",
             "paths": [
                 "public/manifest.json"
             ],
         }]
 
         server_scope = get_balrog_server_scope(config)
-        channel_scopes = get_balrog_channel_scopes(config)
-
         task = {
             'label': label,
             'description': "{} Balrog".format(
                 dep_job.task["metadata"]["description"]),
             # do we have to define worker type somewhere?
             'worker-type': 'scriptworker-prov-v1/balrogworker-v1',
             'worker': {
                 'implementation': 'balrog',
                 'upstream-artifacts': upstream_artifacts,
             },
-            'scopes': [server_scope] + channel_scopes,
+            'scopes': [server_scope],
             'dependencies': {'beetmover': dep_job.label},
             'attributes': attributes,
             'run-on-projects': dep_job.attributes.get('run_on_projects'),
             'treeherder': treeherder,
         }
 
         yield task
--- a/taskcluster/taskgraph/util/scriptworker.py
+++ b/taskcluster/taskgraph/util/scriptworker.py
@@ -101,70 +101,26 @@ BALROG_SCOPE_ALIAS_TO_PROJECT = [[
 ], [
     'beta', set([
         'mozilla-beta',
     ])
 ], [
     'release', set([
         'mozilla-release',
     ])
-], [
-    'esr', set([
-        'mozilla-esr52',
-    ])
 ]]
 
 """Map the balrog scope aliases to the actual scopes.
 """
 BALROG_SERVER_SCOPES = {
-    'nightly': 'project:releng:balrog:server:nightly',
-    'aurora': 'project:releng:balrog:server:aurora',
-    'beta': 'project:releng:balrog:server:beta',
-    'release': 'project:releng:balrog:server:release',
-    'esr': 'project:releng:balrog:server:esr',
-    'default': 'project:releng:balrog:server:dep',
-}
-
-"""Map the balrog scope aliases to the actual channel scopes.
-"""
-BALROG_CHANNEL_SCOPES = {
-    'nightly': [
-        'project:releng:balrog:channel:nightly'
-    ],
-    'aurora': [
-        'project:releng:balrog:channel:aurora'
-    ],
-    'beta': [
-        'project:releng:balrog:channel:beta',
-        'project:releng:balrog:channel:beta-localtest',
-        'project:releng:balrog:channel:beta-cdntest'
-    ],
-    'release': [
-        'project:releng:balrog:channel:release',
-        'project:releng:balrog:channel:release-localtest',
-        'project:releng:balrog:channel:release-cdntest'
-    ],
-    'esr': [
-        'project:releng:balrog:channel:esr',
-        'project:releng:balrog:channel:esr-localtest',
-        'project:releng:balrog:channel:esr-cdntest'
-    ],
-    'default': [
-        'project:releng:balrog:channel:nightly'
-        'project:releng:balrog:channel:aurora'
-        'project:releng:balrog:channel:beta',
-        'project:releng:balrog:channel:beta-localtest',
-        'project:releng:balrog:channel:beta-cdntest'
-        'project:releng:balrog:channel:release',
-        'project:releng:balrog:channel:release-localtest',
-        'project:releng:balrog:channel:release-cdntest'
-        'project:releng:balrog:channel:esr',
-        'project:releng:balrog:channel:esr-localtest',
-        'project:releng:balrog:channel:esr-cdntest'
-    ]
+    'nightly': 'project:releng:balrog:nightly',
+    'aurora': 'project:releng:balrog:nightly',
+    'beta': 'project:releng:balrog:nightly',
+    'release': 'project:releng:balrog:nightly',
+    'default': 'project:releng:balrog:nightly',
 }
 
 
 def get_scope_from_project(alias_to_project_map, alias_to_scope_map, config):
     """Determine the restricted scope from `config.params['project']`.
 
     Args:
         alias_to_project_map (list of lists): each list pair contains the
@@ -217,14 +173,8 @@ get_beetmover_action_scope = functools.p
     BEETMOVER_ACTION_SCOPES
 )
 
 get_balrog_server_scope = functools.partial(
     get_scope_from_project,
     BALROG_SCOPE_ALIAS_TO_PROJECT,
     BALROG_SERVER_SCOPES
 )
-
-get_balrog_channel_scopes = functools.partial(
-    get_scope_from_project,
-    BALROG_SCOPE_ALIAS_TO_PROJECT,
-    BALROG_CHANNEL_SCOPES
-)