diff --git a/taskcluster/ci/test/talos.yml b/taskcluster/ci/test/talos.yml index 78a2b149c184..06c8e7d43e14 100644 --- a/taskcluster/ci/test/talos.yml +++ b/taskcluster/ci/test/talos.yml @@ -421,6 +421,7 @@ talos-xperf: description: "Talos xperf" try-name: xperf treeherder-symbol: tc-T(x) + virtualization: virtual run-on-projects: by-test-platform: windows7-32.*: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try'] @@ -430,17 +431,7 @@ talos-xperf: - --suite=xperf - --add-option - --webServer,localhost - -talos-xperf-stylo-disabled: - description: "Talos Stylo disabled xperf" - try-name: xperf-stylo-disabled - treeherder-symbol: tc-Tsd(x) - run-on-projects: - by-test-platform: - windows7-32.*: ['mozilla-beta', 'mozilla-central', 'try'] - default: [] - mozharness: - extra-options: - - --suite=xperf-stylo-disabled - - --add-option - - --webServer,localhost + config: + by-test-platform: + windows.*: + - talos/windows_vm_config.py diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py index 79e9f8aeaac5..d7bafad6ca25 100644 --- a/taskcluster/taskgraph/transforms/tests.py +++ b/taskcluster/taskgraph/transforms/tests.py @@ -895,6 +895,8 @@ def set_worker_type(config, tests): 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'] + elif test['virtualization'] == 'virtual': + test['worker-type'] = win_worker_type_platform[test['virtualization']] else: test['worker-type'] = 'buildbot-bridge/buildbot-bridge' else: diff --git a/testing/talos/talos/xtalos/xperf_whitelist.json b/testing/talos/talos/xtalos/xperf_whitelist.json index 5148fdca59d4..3a3f63f3caab 100644 --- a/testing/talos/talos/xtalos/xperf_whitelist.json +++ b/testing/talos/talos/xtalos/xperf_whitelist.json @@ -11,6 +11,9 @@ "C:\\$logfile": { "ignore": true }, + "Z:\\$logfile": { + "ignore": true + }, "C:\\Windows\\Prefetch\\{prefetch}.pf": { "ignore": true },