Backed out changeset c45f2ebe0e66 (bug 1274980)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Mon, 07 Nov 2016 17:56:41 +0100
changeset 351462 9ee234b75a3ee9ec75bd6209e3bafe6b41bff1e2
parent 351461 d5de5a3e2d828782458ebd0c8b28671ba128418c
child 351463 b95da309b3985a8cf2efdac88fe974f8e34f0e26
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1274980
milestone52.0a1
backs outc45f2ebe0e66c30eae64ccec2c8834367187217b
Backed out changeset c45f2ebe0e66 (bug 1274980)
taskcluster/taskgraph/transforms/task.py
taskcluster/taskgraph/transforms/tests/make_task_description.py
--- a/taskcluster/taskgraph/transforms/task.py
+++ b/taskcluster/taskgraph/transforms/task.py
@@ -448,17 +448,16 @@ def build_generic_worker_payload(config,
         'mounts': mounts,
         'maxRunTime': worker['max-run-time'],
         'osGroups': worker.get('os-groups', []),
     }
 
     if 'retry-exit-status' in worker:
         raise Exception("retry-exit-status not supported in generic-worker")
 
-
 @payload_builder('macosx-engine')
 def build_macosx_engine_payload(config, task, task_def):
     worker = task['worker']
     artifacts = map(lambda artifact: {
         'name': artifact['name'],
         'path': artifact['path'],
         'type': artifact['type'],
         'expires': task_def['expires'],
--- a/taskcluster/taskgraph/transforms/tests/make_task_description.py
+++ b/taskcluster/taskgraph/transforms/tests/make_task_description.py
@@ -373,17 +373,16 @@ def generic_worker_setup(config, test, t
         'mkdir {} {}'.format(env['APPDATA'], env['TMP']),
         {'task-reference': 'c:\\mozilla-build\\wget\\wget.exe {}'.format(mozharness_url)},
         'c:\\mozilla-build\\info-zip\\unzip.exe mozharness.zip',
         {'task-reference': ' '.join(mh_command)},
         'xcopy build\\blobber_upload_dir public\\test_info /e /i',
         'copy /y logs\\*.* public\\logs\\'
     ]
 
-
 @worker_setup_function("macosx-engine")
 def macosx_engine_setup(config, test, taskdesc):
     mozharness = test['mozharness']
 
     installer_url = ARTIFACT_URL.format('<build>', mozharness['build-artifact-name'])
     test_packages_url = ARTIFACT_URL.format('<build>',
                                             'public/build/target.test_packages.json')
     mozharness_url = ARTIFACT_URL.format('<build>',
@@ -396,17 +395,17 @@ def macosx_engine_setup(config, test, ta
     worker['implementation'] = test['worker-implementation']
 
     worker['artifacts'] = [{
         'name': prefix.rstrip('/'),
         'path': path.rstrip('/'),
         'type': 'directory',
     } for (prefix, path) in ARTIFACTS]
 
-    worker['env'] = {
+    env = worker['env'] = {
         'GECKO_HEAD_REPOSITORY': config.params['head_repository'],
         'GECKO_HEAD_REV': config.params['head_rev'],
         'MOZHARNESS_CONFIG': ' '.join(mozharness['config']),
         'MOZHARNESS_SCRIPT': mozharness['script'],
         'MOZHARNESS_URL': {'task-reference': mozharness_url},
         'MOZILLA_BUILD_URL': {'task-reference': installer_url},
     }