Unlike maxRunTime, deadline includes time before running

This commit is contained in:
Simon Sapin 2018-09-13 15:41:22 +02:00
parent f8063d47d4
commit 029c352b78
2 changed files with 11 additions and 6 deletions

View file

@ -10,7 +10,7 @@ tasks:
provisionerId: aws-provisioner-v1 provisionerId: aws-provisioner-v1
workerType: servo-docker-worker workerType: servo-docker-worker
created: {$fromNow: ''} created: {$fromNow: ''}
deadline: {$fromNow: '1 hour'} deadline: {$fromNow: '1 day'}
metadata: metadata:
name: "Taskcluster experiments for Servo: decision task" name: "Taskcluster experiments for Servo: decision task"
description: "" description: ""
@ -26,7 +26,7 @@ tasks:
- "queue:route:index.project.servo.servo-taskcluster-experiments.*" - "queue:route:index.project.servo.servo-taskcluster-experiments.*"
payload: payload:
maxRunTime: 1200 maxRunTime: {$eval: '20 * 60'}
# https://github.com/servo/taskcluster-bootstrap-docker-images#decision-task # https://github.com/servo/taskcluster-bootstrap-docker-images#decision-task
image: "servobrowser/taskcluster-bootstrap:decision-task@sha256:28045b7ec0485ef363f8cb14f194008b47e9ede99f2ea40a1e945e921fce976e" image: "servobrowser/taskcluster-bootstrap:decision-task@sha256:28045b7ec0485ef363f8cb14f194008b47e9ede99f2ea40a1e945e921fce976e"
features: features:

View file

@ -13,6 +13,7 @@ def main():
"build task", "build task",
"./build-task.sh", "./build-task.sh",
image="servo-x86_64-linux", image="servo-x86_64-linux",
max_run_time_minutes=20,
artifacts=[ artifacts=[
("executable.gz", "/repo/something-rust/something-rust.gz", "1 week"), ("executable.gz", "/repo/something-rust/something-rust.gz", "1 week"),
@ -33,6 +34,7 @@ def main():
"run task", "run task",
"./run-task.sh", "./run-task.sh",
image="buildpack-deps:bionic-scm", image="buildpack-deps:bionic-scm",
max_run_time_minutes=20,
dependencies=[build_task], dependencies=[build_task],
env={"BUILD_TASK_ID": build_task}, env={"BUILD_TASK_ID": build_task},
) )
@ -95,6 +97,7 @@ def build_image(name):
DOCKER_IMAGE_CACHE_EXPIRY DOCKER_IMAGE_CACHE_EXPIRY
), ),
], ],
max_run_time_minutes=20,
image=IMAGE_BUILDER_IMAGE, image=IMAGE_BUILDER_IMAGE,
features={ features={
"dind": True, # docker-in-docker "dind": True, # docker-in-docker
@ -112,8 +115,10 @@ def build_image(name):
return image_build_task return image_build_task
def create_task(name, command, image, artifacts=None, dependencies=None, env=None, cache=None, def create_task(name, command, image, max_run_time_minutes,
scopes=None, routes=None, extra=None, features=None, with_repo=True): artifacts=None, dependencies=None, env=None, cache=None, scopes=None,
routes=None, extra=None, features=None,
with_repo=True):
env = env or {} env = env or {}
if with_repo: if with_repo:
@ -134,7 +139,7 @@ def create_task(name, command, image, artifacts=None, dependencies=None, env=Non
"workerType": "servo-docker-worker", "workerType": "servo-docker-worker",
"created": taskcluster.fromNowJSON(""), "created": taskcluster.fromNowJSON(""),
"deadline": taskcluster.fromNowJSON("1 hour"), "deadline": taskcluster.fromNowJSON("1 day"),
"metadata": { "metadata": {
"name": "Taskcluster experiments for Servo: " + name, "name": "Taskcluster experiments for Servo: " + name,
"description": "", "description": "",
@ -146,7 +151,7 @@ def create_task(name, command, image, artifacts=None, dependencies=None, env=Non
"extra": extra or {}, "extra": extra or {},
"payload": { "payload": {
"cache": cache or {}, "cache": cache or {},
"maxRunTime": 3600, "maxRunTime": max_run_time_minutes * 60,
"image": image, "image": image,
"command": [ "command": [
"/bin/bash", "/bin/bash",