Bug 1418252 - Make talos tests run in Windows coverage build. r=jmaher

--HG--
extra : rebase_source : 8bcfc4112938de91b22497d48482d80eba3ff88c
This commit is contained in:
Marco Castelluccio 2017-11-18 00:05:51 +01:00
parent 1779eec6e9
commit ed422e8561
2 changed files with 12 additions and 6 deletions

View File

@ -1,7 +1,10 @@
job-defaults:
max-run-time: 3600
suite: talos
virtualization: hardware
virtualization:
by-test-platform:
windows10-64-ccov/.*: virtual
default: hardware
mozharness:
script: talos_script.py
no-read-buildbot-config: true
@ -11,6 +14,10 @@ job-defaults:
- talos/mac_config.py
windows.*:
- talos/windows_config.py
windows10-64-ccov/debug:
- talos/windows_vm_config.py
linux64-ccov/opt:
- talos/linux64_config_taskcluster.py
default:
- talos/linux_config.py

View File

@ -675,11 +675,10 @@ def enable_code_coverage(config, tests):
test['run-on-projects'] == 'built-projects':
test['run-on-projects'] = ['mozilla-central', 'try']
# TODO: Fix talos on Windows coverage build.
if test['test-name'].startswith('talos'):
if 'talos' in test['test-name']:
test['max-run-time'] = 7200
test['docker-image'] = {"in-tree": "desktop1604-test"}
test['mozharness']['config'] = ['talos/linux64_config_taskcluster.py']
if 'linux' in test['build-platform']:
test['docker-image'] = {"in-tree": "desktop1604-test"}
test['mozharness']['extra-options'].append('--add-option')
test['mozharness']['extra-options'].append('--cycles,1')
test['mozharness']['extra-options'].append('--add-option')
@ -886,7 +885,7 @@ def set_worker_type(config, tests):
win_worker_type_platform = WINDOWS_WORKER_TYPES[
test_platform.split('/')[0]
]
if test.get('suite', '') == 'talos':
if test.get('suite', '') == 'talos' and 'ccov' not in test['build-platform']:
if try_options.get('taskcluster_worker'):
test['worker-type'] = win_worker_type_platform['hardware']
else: