Bug 1546801: [firefox-ci] Do not enable taskcluster proxy on android bitbar workers; r=dustin a=tomprince CLOSED TREE
authorTom Prince <mozilla@hocat.ca>
Sun, 10 Nov 2019 03:53:25 +0200
changeset 501365 33f64c1ef3e40dc619c5eb8e43c5967959f57b29
parent 501364 7a75cab3dd550b77ba4f748b31c1b45ce2784c84
child 501411 110e47c61308a4691e521cf59a6a05a65815d870
push id114168
push userdluca@mozilla.com
push dateSun, 10 Nov 2019 03:08:55 +0000
treeherdermozilla-inbound@33f64c1ef3e4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin, tomprince
bugs1546801
milestone72.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1546801: [firefox-ci] Do not enable taskcluster proxy on android bitbar workers; r=dustin a=tomprince CLOSED TREE The bitbar workers do not support taskcluster-proxy, and so tooltool internal downloads don't work, even though they had been requested. Differential Revision: https://phabricator.services.mozilla.com//D52480
taskcluster/taskgraph/transforms/job/mozharness_test.py
testing/raptor/raptor/results.py
--- a/taskcluster/taskgraph/transforms/job/mozharness_test.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness_test.py
@@ -388,16 +388,19 @@ def mozharness_test_on_generic_worker(co
         'workdir': run['workdir'],
         'tooltool-downloads': mozharness['tooltool-downloads'],
         'checkout': test['checkout'],
         'command': mh_command,
         'using': 'run-task',
     }
     if is_bitbar:
         job['run']['run-as-root'] = True
+        # FIXME: The bitbar config incorrectly requests internal tooltool downloads
+        # so force it off here.
+        job['run']['tooltool-downloads'] = False
     configure_taskdesc_for_run(config, job, taskdesc, worker['implementation'])
 
 
 @run_job_using('script-engine-autophone', 'mozharness-test', schema=mozharness_test_run_schema)
 def mozharness_test_on_script_engine_autophone(config, job, taskdesc):
     test = taskdesc['run']['test']
     mozharness = test['mozharness']
     worker = taskdesc['worker']
--- a/testing/raptor/raptor/results.py
+++ b/testing/raptor/raptor/results.py
@@ -421,18 +421,21 @@ class BrowsertimeResultsHandler(Perftest
                     )
 
             results.append(bt_result)
 
         return results
 
     def _extract_vmetrics_jobs(self, test, browsertime_json, browsertime_results):
         # XXX will do better later
-        url = ("https://queue.taskcluster.net/v1/task/%s/runs/0/artifacts/public/"
-               "test_info/" % os.environ.get("TASK_ID", "??"))
+        url = ("{root_url}/api/queue/v1/task/{task_id}/runs/0/artifacts/public/"
+               "test_info/".format(
+                   root_url=os.environ.get('TASKCLUSTER_ROOT_URL', 'taskcluster-root-url.invalid'),
+                   task_id=os.environ.get("TASK_ID", "??"),
+               ))
 
         json_url = url + "/".join(browsertime_json.split(os.path.sep)[-3:])
         files = []
         for res in browsertime_results:
             files.extend(res.get("files", {}).get("video", []))
         if len(files) == 0:
             # no video files.
             return None