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

--HG--
extra : amend_source : f4ad4bec75b30da67d6769cceedb70a7957cb638
This commit is contained in:
Tom Prince 2019-11-10 03:53:25 +02:00
Родитель 199d68799d
Коммит c8e1011f7b
2 изменённых файлов: 8 добавлений и 2 удалений

Просмотреть файл

@ -393,6 +393,9 @@ def mozharness_test_on_generic_worker(config, job, taskdesc):
}
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'])

Просмотреть файл

@ -426,8 +426,11 @@ class BrowsertimeResultsHandler(PerftestResultsHandler):
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 = []