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

Make image cache route expire when image artifacts do

Browse source
This commit is contained in:
Simon Sapin 2018-09-13 15:18:40 +02:00
parent 1a6fc7ce77
commit 971d834d10
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
decision-task.py
View file

@ -49,7 +49,8 @@ DECISION_TASK_ID = os.environ["TASK_ID"]
QUEUE = taskcluster.Queue(options={"baseUrl": "http://taskcluster/queue/v1/"}) QUEUE = taskcluster.Queue(options={"baseUrl": "http://taskcluster/queue/v1/"})
INDEX = taskcluster.Index(options={"baseUrl": "http://taskcluster/index/v1/"}) INDEX = taskcluster.Index(options={"baseUrl": "http://taskcluster/index/v1/"})
IMAGE_ARTIFACT_FILENAME = "image.tar.lz4" DOCKER_IMAGE_ARTIFACT_FILENAME = "image.tar.lz4"
DOCKER_IMAGE_CACHE_EXPIRY = "1 week"
REPO = os.path.dirname(__file__) REPO = os.path.dirname(__file__)
@ -60,7 +61,7 @@ def create_task_with_in_tree_dockerfile(name, command, image, **kwargs):
image = { image = {
"type": "task-image", "type": "task-image",
"taskId": image_build_task, "taskId": image_build_task,
"path": "public/" + IMAGE_ARTIFACT_FILENAME, "path": "public/" + DOCKER_IMAGE_ARTIFACT_FILENAME,
} }
return create_task(name, command, image, **kwargs) return create_task(name, command, image, **kwargs)
@ -77,32 +78,42 @@ def build_image(name):
except taskcluster.TaskclusterRestFailure as e: except taskcluster.TaskclusterRestFailure as e:
if e.status_code != 404: if e.status_code != 404:
raise raise
print("404 when looking up route", route, e, vars(e))
image_build_task = create_task( image_build_task = create_task(
"docker image build task for image: " + name, "docker image build task for image: " + name,
""" """
echo "$DOCKERFILE" | docker build -t taskcluster-built - echo "$DOCKERFILE" | docker build -t taskcluster-built -
docker save taskcluster-built | lz4 > /%s docker save taskcluster-built | lz4 > /%s
""" % IMAGE_ARTIFACT_FILENAME, """ % DOCKER_IMAGE_ARTIFACT_FILENAME,
env={ env={
"DOCKERFILE": dockerfile, "DOCKERFILE": dockerfile,
}, },
artifacts=[ artifacts=[
(IMAGE_ARTIFACT_FILENAME, "/" + IMAGE_ARTIFACT_FILENAME, "1 week"), (
DOCKER_IMAGE_ARTIFACT_FILENAME,
"/" + DOCKER_IMAGE_ARTIFACT_FILENAME,
DOCKER_IMAGE_CACHE_EXPIRY
),
], ],
image=IMAGE_BUILDER_IMAGE, image=IMAGE_BUILDER_IMAGE,
features={ features={
"dind": True, # docker-in-docker "dind": True, # docker-in-docker
}, },
with_repo=False, with_repo=False,
routes=["index." + route], routes=[
"index." + route,
],
extra={
"index": {
"expires": taskcluster.fromNowJSON(DOCKER_IMAGE_CACHE_EXPIRY),
},
},
) )
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, artifacts=None, dependencies=None, env=None, cache=None,
scopes=None, routes=None, features=None, with_repo=True): scopes=None, routes=None, extra=None, features=None, with_repo=True):
env = env or {} env = env or {}
if with_repo: if with_repo:
@ -132,6 +143,7 @@ def create_task(name, command, image, artifacts=None, dependencies=None, env=Non
}, },
"scopes": scopes or [], "scopes": scopes or [],
"routes": routes or [], "routes": routes or [],
"extra": extra or {},
"payload": { "payload": {
"cache": cache or {}, "cache": cache or {},
"maxRunTime": 3600, "maxRunTime": 3600,