back out c13bc2963773
authorAki Sasaki <asasaki@mozilla.com>
Thu, 10 Nov 2016 19:14:44 -0800
changeset 439905 c4d85a4454d9b9c880497634bc92d6234376a562
parent 439904 c13bc2963773371c8e4db3661cfb20fd1b6f8d3d
child 439906 5d8ba3560ae9a5f30f730be6e553b4d65654072d
push id36120
push userCallek@gmail.com
push dateWed, 16 Nov 2016 18:58:20 +0000
milestone52.0a1
backs outc13bc2963773371c8e4db3661cfb20fd1b6f8d3d
back out c13bc2963773
taskcluster/taskgraph/transforms/nightly_l10n_signing.py
taskcluster/taskgraph/transforms/signing.py
--- a/taskcluster/taskgraph/transforms/nightly_l10n_signing.py
+++ b/taskcluster/taskgraph/transforms/nightly_l10n_signing.py
@@ -13,19 +13,16 @@ from taskgraph.util.treeherder import jo
 transforms = TransformSequence()
 
 
 @transforms.add
 def make_signing_description(config, jobs):
     for job in jobs:
         job['depname'] = 'unsigned-repack'
 
-        job.setdefault('worker', {})
-        job['worker']['max-run-time'] = 3600
-
         dep_job = job['dependent-task']
         dep_platform = dep_job.attributes.get('build_platform')
 
         job['upstream-artifacts'] = []
         if 'android' in dep_platform:
             job_specs = [
                 {
                     'artifacts': ['public/build/{locale}/target.apk'],
--- a/taskcluster/taskgraph/transforms/signing.py
+++ b/taskcluster/taskgraph/transforms/signing.py
@@ -94,19 +94,17 @@ def make_task_description(config, jobs):
         label = job.get('label', "{}-signing".format(dep_job))
 
         task = {
             'label': label,
             'description': "{} Signing".format(
                 dep_job.task["metadata"]["description"]),
             'worker-type': "scriptworker-prov-v1/signing-linux-v1",
             'worker': {'implementation': 'scriptworker-signing',
-                       'upstream-artifacts': job['upstream-artifacts'],
-                       'max-run-time': 3600,
-                      },
+                       'upstream-artifacts': job['upstream-artifacts']},
             'scopes': ["project:releng:signing:cert:nightly-signing"] + \
                     signing_format_scopes,
             'dependencies': {job['depname']: dep_job.label},
             'attributes': {
                 'nightly': dep_job.attributes.get('nightly', False),
                 'build_platform': dep_job.attributes.get('build_platform'),
                 'build_type': dep_job.attributes.get('build_type'),
             },