Backed out changeset 8c9ee38712de (bug 1284005) for gecko-decision task failures

This commit is contained in:
Carsten "Tomcat" Book
2016-07-07 05:56:00 +02:00
parent f1628835f0
commit 755e48f06f
29 changed files with 67 additions and 149 deletions

View File

@@ -12,10 +12,6 @@ import os
import logging
from slugid import nice as slugid
from taskgraph.util.time import (
current_json_time,
json_time_from_now
)
logger = logging.getLogger(__name__)
@@ -43,6 +39,7 @@ def create_tasks(taskgraph, label_to_taskid):
# that.
for task_id in taskgraph.graph.visit_postorder():
task_def = taskgraph.tasks[task_id].task
# if this task has no dependencies, make it depend on this decision
# task so that it does not start immediately; and so that if this loop
# fails halfway through, none of the already-created tasks run.
@@ -68,11 +65,6 @@ def create_tasks(taskgraph, label_to_taskid):
def _create_task(session, task_id, label, task_def):
# create the task using 'http://taskcluster/queue', which is proxied to the queue service
# with credentials appropriate to this job.
# Resolve timestamps
now = current_json_time(datetime_format=True)
task_def = resolve_timestamps(now, task_def)
logger.debug("Creating task with taskId {} for {}".format(task_id, label))
res = session.put('http://taskcluster/queue/v1/task/{}'.format(task_id),
data=json.dumps(task_def))
@@ -82,17 +74,3 @@ def _create_task(session, task_id, label, task_def):
except:
logger.error(res.text)
res.raise_for_status()
def resolve_timestamps(now, task_def):
def recurse(val):
if isinstance(val, list):
return [recurse(v) for v in val]
elif isinstance(val, dict):
if val.keys() == ['relative-datestamp']:
return json_time_from_now(val['relative-datestamp'], now)
else:
return {k: recurse(v) for k, v in val.iteritems()}
else:
return val
return recurse(task_def)