Bug 1843026 - Use taskcluster-built python for condprof task r=glandium,taskgraph-reviewers,ahal

Re applied now that taskcluster-built python works on OSX.

Differential Revision: https://phabricator.services.mozilla.com/D183367
This commit is contained in:
serge-sans-paille 2023-07-24 07:58:01 +00:00
Родитель 3e46140432
Коммит 25cadcdd11
2 изменённых файлов: 9 добавлений и 2 удалений

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

@ -29,6 +29,7 @@ job-defaults:
worker: worker:
taskcluster-proxy: true taskcluster-proxy: true
max-run-time: 10800 max-run-time: 10800
use-system-python: false
jobs: jobs:
windows2012-64-firefox: windows2012-64-firefox:
worker-type: b-win2022 worker-type: b-win2022
@ -87,8 +88,8 @@ jobs:
- linux64-geckodriver - linux64-geckodriver
run: run:
command: >- command: >-
python3.7 -m venv . && python3 -m venv . &&
bin/python3.7 condprof/main.py bin/python3 condprof/main.py
${EXTRA_ARGS} ${EXTRA_ARGS}
--geckodriver ${MOZ_FETCHES_DIR}/geckodriver --geckodriver ${MOZ_FETCHES_DIR}/geckodriver
--firefox ${MOZ_FETCHES_DIR}/firefox/firefox-bin --firefox ${MOZ_FETCHES_DIR}/firefox/firefox-bin

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

@ -28,6 +28,7 @@ diff_description_schema = Schema(
Optional("run-on-projects"): task_description_schema["run-on-projects"], Optional("run-on-projects"): task_description_schema["run-on-projects"],
Optional("scopes"): task_description_schema["scopes"], Optional("scopes"): task_description_schema["scopes"],
Optional("treeherder"): task_description_schema["treeherder"], Optional("treeherder"): task_description_schema["treeherder"],
Optional("use-system-python"): bool,
Optional("worker"): job_description_schema["worker"], Optional("worker"): job_description_schema["worker"],
Optional("worker-type"): task_description_schema["worker-type"], Optional("worker-type"): task_description_schema["worker-type"],
} }
@ -82,4 +83,9 @@ def generate_scenarios(config, tasks):
"dependencies": copy_task(task["dependencies"]), "dependencies": copy_task(task["dependencies"]),
"fetches": copy_task(task["fetches"]), "fetches": copy_task(task["fetches"]),
} }
use_system_python = task.get("use-system-python", None)
if use_system_python is not None:
taskdesc["use-system-python"] = use_system_python
yield taskdesc yield taskdesc