Backed out changeset 66956b121b93 (bug 1470886) for signin exceptions. CLOSED TREE
authorBrindusan Cristian <cbrindusan@mozilla.com>
Tue, 03 Jul 2018 21:39:52 +0300
changeset 424893 176a499c5b80ece114140af53f6a7fce88e39ab9
parent 424892 e5b6f247a849108db472a6a10909a89dcbc6caa4
child 424894 f8f4551a1c46e718a502d68e45f9a9ed1b4199ce
push id34226
push userrgurzau@mozilla.com
push dateWed, 04 Jul 2018 09:57:31 +0000
treeherdermozilla-central@3d7f2fdc5bf7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1470886
milestone63.0a1
backs out66956b121b939bf9a56bc33d6f3b8ffa58df4131
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 66956b121b93 (bug 1470886) for signin exceptions. CLOSED TREE
.taskcluster.yml
taskcluster/taskgraph/actions/registry.py
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -1,16 +1,14 @@
 # This file is rendered via JSON-e by
 # - mozilla-taskcluster - https://docs.taskcluster.net/reference/integrations/mozilla-taskcluster/docs/taskcluster-yml
 # - cron tasks - taskcluster/taskgraph/cron/decision.py
 # - action tasks - taskcluster/taskgraph/actions/registry.py
 version: 1
 tasks:
-  $if: 'tasks_for in ["hg-push", "action", "cron"]'
-  then:
   - $let:
       # sometimes the push user is just `ffxbld` or the like, but we want an email-like field..
       ownerEmail: {$if: '"@" in push.owner', then: '${push.owner}', else: '${push.owner}@noreply.mozilla.org'}
       # ensure there's no trailing `/` on the repo URL
       repoUrl: {$if: 'repository.url[-1] == "/"', then: {$eval: 'repository.url[:-1]'}, else: {$eval: 'repository.url'}}
     in:
       taskId: {$if: 'tasks_for != "action"', then: '${as_slugid("decision")}'}
       taskGroupId:
@@ -194,10 +192,8 @@ tasks:
                   taskGroupId: '${action.taskGroupId}'
                   taskId: {$eval: 'taskId'}
                   input: {$eval: 'input'}
                   parameters: {$eval: 'parameters'}
           - $if: 'tasks_for == "cron"'
             then:
               cron: {$json: {$eval: 'cron'}}
           - tasks_for: '${tasks_for}'
-  # no tasks for unrecognized tasks_for
-  else: []
--- a/taskcluster/taskgraph/actions/registry.py
+++ b/taskcluster/taskgraph/actions/registry.py
@@ -188,36 +188,30 @@ def register_callback_action(name, title
                 repo_scope = 'assume:repo:{}/{}:branch:default'.format(
                     match.group(1), match.group(2))
                 action['repo_scope'] = repo_scope
 
                 taskcluster_yml = read_taskcluster_yml(graph_config.taskcluster_yml)
                 if taskcluster_yml['version'] != 1:
                     raise Exception(
                         'actions.json must be updated to work with .taskcluster.yml')
-
-                # allow a top-level conditional (bug 1470886)
-                tasks = taskcluster_yml['tasks']
-                if isinstance(tasks, dict) and '$if' in tasks:
-                    tasks = tasks['then']
-
-                if not isinstance(tasks, list):
+                if not isinstance(taskcluster_yml['tasks'], list):
                     raise Exception(
                         '.taskcluster.yml "tasks" must be a list for action tasks')
 
                 rv.update({
                     'kind': 'task',
                     'task': {
                         '$let': {
                             'tasks_for': 'action',
                             'repository': repository,
                             'push': push,
                             'action': action,
                         },
-                        'in': tasks[0],
+                        'in': taskcluster_yml['tasks'][0],
                     },
                 })
 
             # for kind=hook
             elif kind == 'hook':
                 trustDomain = graph_config['trust-domain']
                 level = parameters['level']
                 tcyml_hash = hash_taskcluster_yml(graph_config.taskcluster_yml)