corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1200928 - Part 1: Iterate over all the things in task.extra.locations and build out the test_parameter. r=garndt

Browse Source
This commit is contained in:
Edgar Chen
2015-11-17 16:07:59 +08:00
parent 1e795850d2
commit b39bf9a998
1 changed files with 4 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
testing/taskcluster/mach_commands.py
View File

@@ -420,39 +420,12 @@ class Graph(object):
taskcluster_graph.build_task.validate(build_task) taskcluster_graph.build_task.validate(build_task)
graph['tasks'].append(build_task) graph['tasks'].append(build_task)
test_packages_url, tests_url, mozharness_url = None, None, None for location in build_task['task']['extra'].get('locations', {}):
build_parameters['{}_url'.format(location)] = ARTIFACT_URL.format(
if 'test_packages' in build_task['task']['extra']['locations']:
test_packages_url = ARTIFACT_URL.format(
build_parameters['build_slugid'], build_parameters['build_slugid'],
build_task['task']['extra']['locations']['test_packages'] build_task['task']['extra']['locations'][location]
) )
if 'tests' in build_task['task']['extra']['locations']:
tests_url = ARTIFACT_URL.format(
build_parameters['build_slugid'],
build_task['task']['extra']['locations']['tests']
)
if 'mozharness' in build_task['task']['extra']['locations']:
mozharness_url = ARTIFACT_URL.format(
build_parameters['build_slugid'],
build_task['task']['extra']['locations']['mozharness']
)
build_url = ARTIFACT_URL.format(
build_parameters['build_slugid'],
build_task['task']['extra']['locations']['build']
)
build_parameters['build_url'] = build_url
# img_url is only necessary for device builds
img_url = ARTIFACT_URL.format(
build_parameters['build_slugid'],
build_task['task']['extra']['locations'].get('img', '')
)
build_parameters['img_url'] = img_url
define_task = DEFINE_TASK.format(build_task['task']['workerType']) define_task = DEFINE_TASK.format(build_task['task']['workerType'])
for route in build_task['task'].get('routes', []): for route in build_task['task'].get('routes', []):
@@ -514,12 +487,7 @@ class Graph(object):
test_parameters = merge_dicts(build_parameters, test_parameters = merge_dicts(build_parameters,
test.get('additional-parameters', {})) test.get('additional-parameters', {}))
test_parameters = copy.copy(build_parameters) test_parameters = copy.copy(build_parameters)
if tests_url:
test_parameters['tests_url'] = tests_url
if test_packages_url:
test_parameters['test_packages_url'] = test_packages_url
if mozharness_url:
test_parameters['mozharness_url'] = mozharness_url
test_definition = templates.load(test['task'], {})['task'] test_definition = templates.load(test['task'], {})['task']
chunk_config = test_definition['extra'].get('chunks', {}) chunk_config = test_definition['extra'].get('chunks', {})