Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1339038 - Replicate BB environment variables. r=dustin

Browse Source 
There are some environment variables necessary to run test jobs in BB
which are also necessary for taskcluster-worker. They were copied from
[1].

Additionally, native-engine was broken by bug 1325701. We fix it in this
commit.

[1] https://github.com/mozilla-releng/build-buildbotcustom/blob/master/env.py#L89-L96
This commit is contained in:
Wander Lairson Costa 2017-02-22 14:47:00 -05:00
parent af0bb93cff
commit 90611046e2
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
taskcluster/taskgraph/transforms/job/mozharness_test.py
View File

@ -264,8 +264,8 @@ def mozharness_test_on_windows(config, job, taskdesc):
]
@run_job_using('macosx-engine', 'mozharness-test', schema=mozharness_test_run_schema)
def mozharness_test_on_mac_osx(config, job, taskdesc):
@run_job_using('native-engine', 'mozharness-test', schema=mozharness_test_run_schema)
def mozharness_test_on_native_engine(config, job, taskdesc):
test = taskdesc['run']['test']
mozharness = test['mozharness']
worker = taskdesc['worker']
@ -282,6 +282,7 @@ def mozharness_test_on_mac_osx(config, job, taskdesc):
'type': 'directory',
} for (prefix, path) in ARTIFACTS]
worker['reboot'] = test['reboot']
worker['env'] = {
'GECKO_HEAD_REPOSITORY': config.params['head_repository'],
'GECKO_HEAD_REV': config.params['head_rev'],
@ -289,9 +290,15 @@ def mozharness_test_on_mac_osx(config, job, taskdesc):
'MOZHARNESS_SCRIPT': mozharness['script'],
'MOZHARNESS_URL': {'task-reference': mozharness_url},
'MOZILLA_BUILD_URL': {'task-reference': installer_url},
"MOZ_NO_REMOTE": '1',
"NO_EM_RESTART": '1',
"XPCOM_DEBUG_BREAK": 'warn',
"NO_FAIL_ON_TEST_ERRORS": '1',
"MOZ_HIDE_RESULTS_TABLE": '1',
"MOZ_NODE_PATH": "/usr/local/bin/node",
}
worker['link'] = '{}/raw-file/{}/taskcluster/scripts/tester/test-macosx.sh'.format(
worker['context'] = '{}/raw-file/{}/taskcluster/scripts/tester/test-macosx.sh'.format(
config.params['head_repository'], config.params['head_rev']
)

4
taskcluster/taskgraph/transforms/task.py
View File

@ -247,7 +247,7 @@ task_description_schema = Schema({
Extra: basestring, # additional properties are allowed
},
}, {
'implementation': 'native-engine',
Required('implementation'): 'native-engine',
# A link for an executable to download
Optional('context'): basestring,
@ -257,7 +257,7 @@ task_description_schema = Schema({
Optional('reboot'): bool,
# the command to run
Required('command'): [taskref_or_string],
Optional('command'): [taskref_or_string],
# environment variables
Optional('env'): {basestring: taskref_or_string},

1
taskcluster/taskgraph/transforms/tests.py
View File

@ -665,7 +665,6 @@ def make_job_description(config, tests):
jobdesc['worker-type'] = 'buildbot-bridge/buildbot-bridge'
elif implementation == 'native-engine':
jobdesc['worker-type'] = 'tc-worker-provisioner/gecko-t-osx-10-10'
jobdesc['worker']['command'] = []
elif implementation == 'generic-worker':
test_platform = test['test-platform'].split('/')[0]
jobdesc['worker-type'] = WORKER_TYPE[test_platform]