Bug 1492128: Set TASKCLUSTER_ROOT_URL in tasks that use the taskcluster proxy; r=dustin a=release
authorTom Prince <mozilla@hocat.ca>
Tue, 30 Oct 2018 21:03:48 +0000
changeset 501018 4a8f26b29962f52103234709f16c3875d48336ed
parent 501017 c3105c9e0647782a6cecc6a12dcd653a87720fc9
child 501019 9973958455418abb4db5654b3aa6717d297bac73
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin, release
bugs1492128
milestone64.0
Bug 1492128: Set TASKCLUSTER_ROOT_URL in tasks that use the taskcluster proxy; r=dustin a=release This sets `TASKCLUSTER_BASE_URL` instead of `TASKCLUSTER_ROOT_URL`, since the proxy doesn't support the redeployable URL schema yet. Differential Revision: https://phabricator.services.mozilla.com/D10149
taskcluster/taskgraph/transforms/task.py
--- a/taskcluster/taskgraph/transforms/task.py
+++ b/taskcluster/taskgraph/transforms/task.py
@@ -821,16 +821,17 @@ def build_docker_worker_payload(config, 
 
     features = {}
 
     if worker.get('relengapi-proxy'):
         features['relengAPIProxy'] = True
 
     if worker.get('taskcluster-proxy'):
         features['taskclusterProxy'] = True
+        worker['env']['TASKCLUSTER_PROXY_URL'] = 'http://taskcluster/'
 
     if worker.get('allow-ptrace'):
         features['allowPtrace'] = True
         task_def['scopes'].append('docker-worker:feature:allowPtrace')
 
     if worker.get('chain-of-trust'):
         features['chainOfTrust'] = True
 
@@ -1048,16 +1049,17 @@ def build_generic_worker_payload(config,
 
     features = {}
 
     if worker.get('chain-of-trust'):
         features['chainOfTrust'] = True
 
     if worker.get('taskcluster-proxy'):
         features['taskclusterProxy'] = True
+        worker['env']['TASKCLUSTER_PROXY_URL'] = 'http://taskcluster/'
 
     if worker.get('run-as-administrator', False):
         features['runAsAdministrator'] = True
 
     if features:
         task_def['payload']['features'] = features
 
     # coalesce / superseding