Backed out 2 changesets (bug 1560134) for failures at taskcluster/taskgraph/test/test_transforms_job.py on a CLOSED TREE

Backed out changeset a14daf0a53cf (bug 1560134)
Backed out changeset 35f409d120b1 (bug 1560134)

--HG--
extra : rebase_source : 4b57900cd0cc9ef1e9841509d4d2cc6ed70cfc20

taskcluster/ci/config.yml

@@ -385,11 +385,6 @@ workers:
             implementation: generic-worker
             os: windows
             worker-type: 'gecko-{alias}'
-        succeed:
-            provisioner: built-in
-            implementation: succeed
-            os: none
-            worker-type: succeed
         t-win7-32(|-gpu):
             provisioner: aws-provisioner-v1
             implementation: generic-worker

taskcluster/ci/post-balrog-dummy/kind.yml

@@ -16,6 +16,13 @@ job-template:
     description: Dummy task to deal with max_dependencies
     run-on-projects: []
     shipping-phase: promote
-    worker-type: succeed
+    worker-type: b-linux
     worker:
-        implementation: succeed
+        implementation: docker-worker
+        os: linux
+        docker-image: "ubuntu:16.10"
+        max-run-time: 600
+        command:
+            - /bin/bash
+            - -c
+            - echo "Dummy task"

taskcluster/ci/post-beetmover-checksums-dummy/kind.yml

@@ -21,24 +21,45 @@ jobs:
         run-on-projects: []
         shipping-phase: promote
         shipping-product: firefox
-        worker-type: succeed
+        worker-type: b-linux
         worker:
-            implementation: succeed
+            implementation: docker-worker
+            os: linux
+            docker-image: "ubuntu:16.10"
+            max-run-time: 600
+            command:
+                - /bin/bash
+                - -c
+                - echo "Dummy task"
     devedition-promote:
         name: post-beetmover-checksums-dummy
         description: Dummy task to deal with max_dependencies
         run-on-projects: []
         shipping-phase: promote
         shipping-product: devedition
-        worker-type: succeed
+        worker-type: b-linux
         worker:
-            implementation: succeed
+            implementation: docker-worker
+            os: linux
+            docker-image: "ubuntu:16.10"
+            max-run-time: 600
+            command:
+                - /bin/bash
+                - -c
+                - echo "Dummy task"
     fennec-promote:
         name: post-beetmover-checksums-dummy
         description: Dummy task to deal with max_dependencies
         run-on-projects: []
         shipping-phase: promote
         shipping-product: fennec
-        worker-type: succeed
+        worker-type: b-linux
         worker:
-            implementation: succeed
+            implementation: docker-worker
+            os: linux
+            docker-image: "ubuntu:16.10"
+            max-run-time: 600
+            command:
+                - /bin/bash
+                - -c
+                - echo "Dummy task"

taskcluster/ci/post-beetmover-dummy/kind.yml

@@ -20,6 +20,13 @@ job-template:
     description: Dummy task to deal with max_dependencies
     run-on-projects: []
     shipping-phase: promote
-    worker-type: succeed
+    worker-type: b-linux
     worker:
-        implementation: succeed
+        implementation: docker-worker
+        os: linux
+        docker-image: "ubuntu:16.10"
+        max-run-time: 600
+        command:
+            - /bin/bash
+            - -c
+            - echo "Dummy task"

taskcluster/ci/post-langpack-dummy/kind.yml

@@ -18,9 +18,16 @@ jobs:
         run-on-projects: []
         shipping-phase: promote
         shipping-product: firefox
-        worker-type: succeed
+        worker-type: b-linux
         worker:
-            implementation: succeed
+            implementation: docker-worker
+            os: linux
+            docker-image: "ubuntu:16.10"
+            max-run-time: 600
+            command:
+                - /bin/bash
+                - -c
+                - echo "Dummy task"
 
     devedition-promote:
         name: post-langpack-dummy
@@ -28,6 +35,13 @@ jobs:
         run-on-projects: []
         shipping-phase: promote
         shipping-product: devedition
-        worker-type: succeed
+        worker-type: b-linux
         worker:
-            implementation: succeed
+            implementation: docker-worker
+            os: linux
+            docker-image: "ubuntu:16.10"
+            max-run-time: 600
+            command:
+                - /bin/bash
+                - -c
+                - echo "Dummy task"

taskcluster/ci/release-notify-promote/kind.yml

@@ -19,9 +19,16 @@ job-defaults:
     description: Sends email to release-drivers telling release was promoted.
     run-on-projects: []
     shipping-phase: promote
-    worker-type: succeed
+    worker-type: b-linux
     worker:
-        implementation: succeed
+        implementation: docker-worker
+        os: linux
+        docker-image: "ubuntu:16.10"
+        max-run-time: 600
+        command:
+            - /bin/bash
+            - -c
+            - echo "Dummy task"
     notifications:
         subject: "{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]} is in the candidates directory"
         message: "{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]} is in the candidates directory"

taskcluster/ci/release-notify-push/kind.yml

@@ -17,9 +17,16 @@ job-defaults:
     description: Sends email to release-drivers telling release was pushed.
     run-on-projects: []
     shipping-phase: push
-    worker-type: succeed
+    worker-type: b-linux
     worker:
-        implementation: succeed
+        implementation: docker-worker
+        os: linux
+        docker-image: "ubuntu:16.10"
+        max-run-time: 600
+        command:
+            - /bin/bash
+            - -c
+            - echo "Dummy task"
     notifications:
         subject: "{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]} has been pushed to cdntest"
         message: "{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]} has been pushed to cdntest"

taskcluster/ci/release-notify-ship/kind.yml

@@ -21,9 +21,16 @@ job-defaults:
     description: Sends email to release-drivers telling release was shipped.
     run-on-projects: []
     shipping-phase: ship
-    worker-type: succeed
+    worker-type: b-linux
     worker:
-        implementation: succeed
+        implementation: docker-worker
+        os: linux
+        docker-image: "ubuntu:16.10"
+        max-run-time: 600
+        command:
+            - /bin/bash
+            - -c
+            - echo "Dummy task"
     notifications:
         emails:
             by-project:

taskcluster/ci/release-partner-repack-chunking-dummy/kind.yml

@@ -33,6 +33,13 @@ job-template:
     name: release-partner-repack-chunking-dummy
     description: Dummy task to deal with fanning out Linux partner repacks
     run-on-projects: []
-    worker-type: succeed
+    worker-type: b-linux
     worker:
-        implementation: succeed
+        implementation: docker-worker
+        os: linux
+        docker-image: "ubuntu:16.10"
+        max-run-time: 600
+        command:
+            - /bin/bash
+            - -c
+            - echo "Dummy task"

taskcluster/ci/release-secondary-notify-ship/kind.yml

@@ -18,9 +18,16 @@ job-defaults:
     description: Sends email to release-drivers telling release was shipped.
     run-on-projects: []
     shipping-phase: ship
-    worker-type: succeed
+    worker-type: b-linux
     worker:
-        implementation: succeed
+        implementation: docker-worker
+        os: linux
+        docker-image: "ubuntu:16.10"
+        max-run-time: 600
+        command:
+            - /bin/bash
+            - -c
+            - echo "Dummy task"
     notifications:
         emails:
             by-project:

taskcluster/taskgraph/transforms/task.py

@@ -16,8 +16,6 @@ import re
 import time
 from copy import deepcopy
 
-import attr
-
 from mozbuild.util import memoize
 from taskgraph.util.attributes import TRUNK_PROJECTS
 from taskgraph.util.hash import hash_path
@@ -231,7 +229,7 @@ task_description_schema = Schema({
     Optional('release-artifacts'): [basestring],
 
     # information specific to the worker implementation that will run this task
-    Optional('worker'): {
+    'worker': {
         Required('implementation'): basestring,
         Extra: object,
     }
@@ -329,17 +327,12 @@ def get_default_priority(graph_config, project):
 payload_builders = {}
 
 
-@attr.s(frozen=True)
-class PayloadBuilder(object):
-    schema = attr.ib(type=Schema)
-    builder = attr.ib()
-
-
 def payload_builder(name, schema):
     schema = Schema({Required('implementation'): name}).extend(schema)
 
     def wrap(func):
-        payload_builders[name] = PayloadBuilder(schema, func)
+        payload_builders[name] = func
+        func.schema = Schema(schema)
         return func
     return wrap
 
@@ -1277,9 +1270,7 @@ def build_invalid_payload(config, task, task_def):
 @payload_builder('always-optimized', schema={
     Extra: object,
 })
-@payload_builder('succeed', schema={
-})
-def build_dummy_payload(config, task, task_def):
+def build_always_optimized_payload(config, task, task_def):
     task_def['payload'] = {}
 
 
@@ -1803,7 +1794,7 @@ def build_task(config, tasks):
                 th_push_link)
 
         # add the payload and adjust anything else as required (e.g., scopes)
-        payload_builders[task['worker']['implementation']].builder(config, task, task_def)
+        payload_builders[task['worker']['implementation']](config, task, task_def)
 
         # Resolve run-on-projects
         build_platform = attributes.get('build_platform')
@@ -1873,11 +1864,11 @@ def check_task_identifiers(config, tasks):
     """
     e = re.compile("^[a-zA-Z0-9_-]{1,38}$")
     for task in tasks:
-        for attrib in ('workerType', 'provisionerId'):
-            if not e.match(task['task'][attrib]):
+        for attr in ('workerType', 'provisionerId'):
+            if not e.match(task['task'][attr]):
                 raise Exception(
                     'task {}.{} is not a valid identifier: {}'.format(
-                        task['label'], attrib, task['task'][attrib]))
+                        task['label'], attr, task['task'][attr]))
         yield task