From 4834d960f8d4106b840167824d41ee736306cfbf Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Fri, 8 Mar 2019 07:00:02 +0000 Subject: [PATCH] Bug 1532783: [taskgraph] Move handling of windows scopes to taskgraph.transfroms.task; r=dustin Currently the scopes are handled in some test-specific code. However, there is logic not to be in generic code. Differential Revision: https://phabricator.services.mozilla.com/D22447 --HG-- extra : moz-landing-system : lando --- .../taskgraph/transforms/job/mozharness_test.py | 8 -------- taskcluster/taskgraph/transforms/task.py | 10 +++++++++- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/taskcluster/taskgraph/transforms/job/mozharness_test.py b/taskcluster/taskgraph/transforms/job/mozharness_test.py index 33ffba3d7d97..0b6345a18fde 100644 --- a/taskcluster/taskgraph/transforms/job/mozharness_test.py +++ b/taskcluster/taskgraph/transforms/job/mozharness_test.py @@ -204,12 +204,6 @@ def mozharness_test_on_generic_worker(config, job, taskdesc): upstream_task = '' if mozharness['requires-signed-builds'] else '' installer_url = get_artifact_url(upstream_task, mozharness['build-artifact-name']) - taskdesc['scopes'].extend( - ['generic-worker:os-group:{}/{}'.format( - job['worker-type'], - group - ) for group in test['os-groups']]) - worker['os-groups'] = test['os-groups'] # run-as-administrator is a feature for workers with UAC enabled and as such should not be @@ -220,8 +214,6 @@ def mozharness_test_on_generic_worker(config, job, taskdesc): # for more information about UAC. if test.get('run-as-administrator', False): if job['worker-type'].startswith('aws-provisioner-v1/gecko-t-win10-64'): - taskdesc['scopes'].extend( - ['generic-worker:run-as-administrator:{}'.format(job['worker-type'])]) worker['run-as-administrator'] = True else: raise Exception('run-as-administrator not supported on {}'.format(job['worker-type'])) diff --git a/taskcluster/taskgraph/transforms/task.py b/taskcluster/taskgraph/transforms/task.py index f7d630884bd3..8777384c1628 100644 --- a/taskcluster/taskgraph/transforms/task.py +++ b/taskcluster/taskgraph/transforms/task.py @@ -808,8 +808,13 @@ def build_generic_worker_payload(config, task, task_def): if mounts: task_def['payload']['mounts'] = mounts - if worker.get('os-groups', []): + if worker.get('os-groups'): task_def['payload']['osGroups'] = worker['os-groups'] + task_def['scopes'].extend( + ['generic-worker:os-group:{}/{}'.format( + task['worker-type'], + group + ) for group in worker['os-groups']]) features = {} @@ -824,6 +829,9 @@ def build_generic_worker_payload(config, task, task_def): if worker.get('run-as-administrator', False): features['runAsAdministrator'] = True + task_def['scopes'].append( + 'generic-worker:run-as-administrator:{}'.format(task['worker-type']), + ) if features: task_def['payload']['features'] = features