From da8f6490c3ee1ec497cb02e755b111a16116e525 Mon Sep 17 00:00:00 2001 From: Joel Maher Date: Wed, 22 Aug 2018 18:27:54 +0000 Subject: [PATCH] Bug 1439588 - run xperf in os administrator group. r=pmoore run xperf in os groups=administrators and support os_groups in taskcluster Differential Revision: https://phabricator.services.mozilla.com/D4001 --HG-- extra : moz-landing-system : lando --- taskcluster/ci/test/talos.yml | 1 + taskcluster/taskgraph/transforms/job/mozharness_test.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/taskcluster/ci/test/talos.yml b/taskcluster/ci/test/talos.yml index 79000b3daca0..0ad1b0a048fd 100644 --- a/taskcluster/ci/test/talos.yml +++ b/taskcluster/ci/test/talos.yml @@ -602,6 +602,7 @@ talos-xperf: try-name: xperf treeherder-symbol: T(x) virtualization: virtual + os-groups: ['Administrators'] run-on-projects: by-test-platform: windows7-32-msvc/.*: ['mozilla-beta', 'mozilla-central', 'try'] diff --git a/taskcluster/taskgraph/transforms/job/mozharness_test.py b/taskcluster/taskgraph/transforms/job/mozharness_test.py index 37d74b856f70..612314182e5b 100644 --- a/taskcluster/taskgraph/transforms/job/mozharness_test.py +++ b/taskcluster/taskgraph/transforms/job/mozharness_test.py @@ -206,7 +206,10 @@ def mozharness_test_on_generic_worker(config, job, taskdesc): installer_url = get_artifact_url(upstream_task, mozharness['build-artifact-name']) taskdesc['scopes'].extend( - ['generic-worker:os-group:{}'.format(group) for group in test['os-groups']]) + ['generic-worker:os-group:{}/{}'.format( + job['worker-type'], + group + ) for group in test['os-groups']]) worker['os-groups'] = test['os-groups']