Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add a decision task for try-windows-ami

Browse source
This commit is contained in:
Simon Sapin 2019-11-06 19:56:32 +01:00
parent 7474b309b4
commit b3ca13cc65
2 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
etc/taskcluster/decision_task.py
View file

@ -90,6 +90,10 @@ def main(task_for):
linux_tidy_unit_untrusted() 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 # https://tools.taskcluster.net/hooks/project-servo/daily
elif task_for == "daily": elif task_for == "daily":
daily_tasks_setup() daily_tasks_setup()
@ -447,9 +451,9 @@ def uwp_nightly():
) )
def windows_unit(): def windows_unit(worker_type=None, cached=True):
return ( task = (
windows_build_task("Dev build + unit tests") windows_build_task("Dev build + unit tests", worker_type=worker_type)
.with_treeherder("Windows x64", "Unit") .with_treeherder("Windows x64", "Unit")
.with_script( .with_script(
# Not necessary as this would be done at the start of `build`, # 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", .with_artifacts("repo/target/debug/msi/Servo.exe",
"repo/target/debug/msi/Servo.zip") "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(): 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 ( return (
decisionlib.WindowsGenericWorkerTask(name) decisionlib.WindowsGenericWorkerTask(name)
.with_worker_type("servo-win2016" if CONFIG.legacy_tc_deployment else "win2016") .with_worker_type(worker_type)
.with_treeherder_required() .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 = { hashes = {
"devel": { "devel": {
"x86_64": "c136cbfb0330041d52fe6ec4e3e468563176333c857f6ed71191ebc37fc9d605", "x86_64": "c136cbfb0330041d52fe6ec4e3e468563176333c857f6ed71191ebc37fc9d605",
@ -813,7 +822,7 @@ def windows_build_task(name, package=True, arch="x86_64"):
} }
version = "1.16.0" version = "1.16.0"
task = ( task = (
windows_task(name) windows_task(name, worker_type=worker_type)
.with_max_run_time_minutes(90) .with_max_run_time_minutes(90)
.with_env( .with_env(
**build_env, **build_env,

4
etc/taskcluster/mock.py
View file

@ -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["GIT_REF"] = "refs/heads/auto"
os.environ["TASKCLUSTER_ROOT_URL"] = "https://taskcluster.net" os.environ["TASKCLUSTER_ROOT_URL"] = "https://taskcluster.net"
os.environ["TASKCLUSTER_PROXY_URL"] = "http://taskcluster" os.environ["TASKCLUSTER_PROXY_URL"] = "http://taskcluster"
os.environ["NEW_AMI_WORKER_TYPE"] = "-"
import decision_task import decision_task
print("\n# Push:") print("\n# Push:")
@ -64,6 +65,9 @@ decision_task.main("github-push")
print("\n# Daily:") print("\n# Daily:")
decision_task.main("daily") decision_task.main("daily")
print("\n# Try AMI:")
decision_task.main("try-windows-ami")
print("\n# PR:") print("\n# PR:")
decision_task.main("github-pull-request") decision_task.main("github-pull-request")