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

Clarify index v.s. route terminology

Browse source
This commit is contained in:
Simon Sapin 2018-09-24 17:23:19 +02:00
parent 62822fb103
commit 8bed0cb044
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
etc/ci/taskcluster/decision-task.py
View file

@ -92,9 +92,9 @@ def linux_wpt():
def linux_release_build(): def linux_release_build():
return decision.find_or_create_task( return decision.find_or_create_task(
route_bucket="build.linux_x86-64_release", index_bucket="build.linux_x86-64_release",
route_key=os.environ["GIT_SHA"], # Set in .taskcluster.yml index_key=os.environ["GIT_SHA"], # Set in .taskcluster.yml
route_expiry=build_artifacts_expiry, index_expiry=build_artifacts_expiry,
task_name="Linux x86_64: release build", task_name="Linux x86_64: release build",
script=""" script="""
@ -179,7 +179,7 @@ def dockerfile_path(name):
decision = DecisionTask( decision = DecisionTask(
task_name_template="Servo: %s", task_name_template="Servo: %s",
route_prefix="project.servo.servo", index_prefix="project.servo.servo",
worker_type="servo-docker-worker", worker_type="servo-docker-worker",
) )

26
etc/ci/taskcluster/decisionlib.py
View file

@ -29,10 +29,10 @@ class DecisionTask:
DOCKER_IMAGE_BUILDER_IMAGE = "servobrowser/taskcluster-bootstrap:image-builder@sha256:" \ DOCKER_IMAGE_BUILDER_IMAGE = "servobrowser/taskcluster-bootstrap:image-builder@sha256:" \
"0a7d012ce444d62ffb9e7f06f0c52fedc24b68c2060711b313263367f7272d9d" "0a7d012ce444d62ffb9e7f06f0c52fedc24b68c2060711b313263367f7272d9d"
def __init__(self, *, route_prefix, task_name_template="%s", def __init__(self, *, index_prefix, task_name_template="%s",
worker_type="github-worker", docker_image_cache_expiry="1 year"): worker_type="github-worker", docker_image_cache_expiry="1 year"):
self.task_name_template = task_name_template self.task_name_template = task_name_template
self.route_prefix = route_prefix self.index_prefix = index_prefix
self.worker_type = worker_type self.worker_type = worker_type
self.docker_image_cache_expiry = docker_image_cache_expiry self.docker_image_cache_expiry = docker_image_cache_expiry
self.routes_for_all_subtasks = [] self.routes_for_all_subtasks = []
@ -43,26 +43,26 @@ class DecisionTask:
self.index_service = taskcluster.Index(options={"baseUrl": "http://taskcluster/index/v1/"}) self.index_service = taskcluster.Index(options={"baseUrl": "http://taskcluster/index/v1/"})
self.now = datetime.datetime.utcnow() self.now = datetime.datetime.utcnow()
self.found_or_created_routes = {} self.found_or_created_indices = {}
def from_now_json(self, offset): def from_now_json(self, offset):
return taskcluster.stringDate(taskcluster.fromNow(offset, dateObj=self.now)) return taskcluster.stringDate(taskcluster.fromNow(offset, dateObj=self.now))
def find_or_create_task(self, *, route_bucket, route_key, route_expiry, artifacts, **kwargs): def find_or_create_task(self, *, index_bucket, index_key, index_expiry, artifacts, **kwargs):
route = "%s.%s.%s" % (self.route_prefix, route_bucket, route_key) index_path = "%s.%s.%s" % (self.index_prefix, index_bucket, index_key)
task_id = self.found_or_created_routes.get(route) task_id = self.found_or_created_indices.get(index_path)
if task_id is not None: if task_id is not None:
return task_id return task_id
try: try:
result = self.index_service.findTask(route) result = self.index_service.findTask(index_path)
task_id = result["taskId"] task_id = result["taskId"]
except taskcluster.TaskclusterRestFailure as e: except taskcluster.TaskclusterRestFailure as e:
if e.status_code == 404: if e.status_code == 404:
task_id = self.create_task( task_id = self.create_task(
routes=[ routes=[
"index." + route, "index." + index_path,
], ],
extra={ extra={
"index": { "index": {
@ -70,7 +70,7 @@ class DecisionTask:
}, },
}, },
artifacts=[ artifacts=[
(artifact, route_expiry) (artifact, index_expiry)
for artifact in artifacts for artifact in artifacts
], ],
**kwargs **kwargs
@ -78,7 +78,7 @@ class DecisionTask:
else: else:
raise raise
self.found_or_created_routes[route] = task_id self.found_or_created_indices[index_path] = task_id
return task_id return task_id
def find_or_build_docker_image(self, dockerfile): def find_or_build_docker_image(self, dockerfile):
@ -86,9 +86,9 @@ class DecisionTask:
digest = hashlib.sha256(dockerfile_contents).hexdigest() digest = hashlib.sha256(dockerfile_contents).hexdigest()
return self.find_or_create_task( return self.find_or_create_task(
route_bucket="docker-image", index_bucket="docker-image",
route_key=digest, index_key=digest,
route_expiry=self.docker_image_cache_expiry, index_expiry=self.docker_image_cache_expiry,
task_name="Docker image: " + image_name(dockerfile), task_name="Docker image: " + image_name(dockerfile),
script=""" script="""