diff options
Diffstat (limited to 'etc/taskcluster')
| -rw-r--r-- | etc/taskcluster/decision_task.py | 25 | ||||
| -rwxr-xr-x | etc/taskcluster/mock.py | 4 |
2 files changed, 21 insertions, 8 deletions
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index 148ee81cc0c..39700e5da96 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -90,6 +90,10 @@ def main(task_for): linux_tidy_unit_untrusted() + elif task_for == "try-windows-ami": + CONFIG.git_sha_is_current_head() + windows_unit(os.environ["NEW_AMI_WORKER_TYPE"], cached=False) + # https://tools.taskcluster.net/hooks/project-servo/daily elif task_for == "daily": daily_tasks_setup() @@ -447,9 +451,9 @@ def uwp_nightly(): ) -def windows_unit(): - return ( - windows_build_task("Dev build + unit tests") +def windows_unit(worker_type=None, cached=True): + task = ( + windows_build_task("Dev build + unit tests", worker_type=worker_type) .with_treeherder("Windows x64", "Unit") .with_script( # Not necessary as this would be done at the start of `build`, @@ -464,8 +468,11 @@ def windows_unit(): ) .with_artifacts("repo/target/debug/msi/Servo.exe", "repo/target/debug/msi/Servo.zip") - .find_or_create("build.windows_x64_dev." + CONFIG.task_id()) ) + if cached: + return task.find_or_create("build.windows_x64_dev." + CONFIG.task_id()) + else: + return task.create() def windows_release(): @@ -744,10 +751,12 @@ def linux_task(name): ) -def windows_task(name): +def windows_task(name, worker_type=None): + if worker_type is None: + worker_type = "servo-win2016" if CONFIG.legacy_tc_deployment else "win2016" return ( decisionlib.WindowsGenericWorkerTask(name) - .with_worker_type("servo-win2016" if CONFIG.legacy_tc_deployment else "win2016") + .with_worker_type(worker_type) .with_treeherder_required() ) @@ -799,7 +808,7 @@ def android_build_task(name): ) -def windows_build_task(name, package=True, arch="x86_64"): +def windows_build_task(name, package=True, arch="x86_64", worker_type=None): hashes = { "devel": { "x86_64": "c136cbfb0330041d52fe6ec4e3e468563176333c857f6ed71191ebc37fc9d605", @@ -813,7 +822,7 @@ def windows_build_task(name, package=True, arch="x86_64"): } version = "1.16.0" task = ( - windows_task(name) + windows_task(name, worker_type=worker_type) .with_max_run_time_minutes(90) .with_env( **build_env, diff --git a/etc/taskcluster/mock.py b/etc/taskcluster/mock.py index c0b45e6a1f4..1f66eb0c492 100755 --- a/etc/taskcluster/mock.py +++ b/etc/taskcluster/mock.py @@ -46,6 +46,7 @@ os.environ.update(**{k: k for k in "TASK_ID TASK_OWNER TASK_SOURCE GIT_URL GIT_S os.environ["GIT_REF"] = "refs/heads/auto" os.environ["TASKCLUSTER_ROOT_URL"] = "https://taskcluster.net" os.environ["TASKCLUSTER_PROXY_URL"] = "http://taskcluster" +os.environ["NEW_AMI_WORKER_TYPE"] = "-" import decision_task print("\n# Push:") @@ -64,6 +65,9 @@ decision_task.main("github-push") print("\n# Daily:") decision_task.main("daily") +print("\n# Try AMI:") +decision_task.main("try-windows-ami") + print("\n# PR:") decision_task.main("github-pull-request") |