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

Use the same "now" for all fromNow calls

Browse source
This commit is contained in:
Simon Sapin 2018-09-13 17:11:20 +02:00
parent fe88dba26d
commit 5da5cdebea
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
decisionlib.py
View file

@ -4,6 +4,7 @@
Project-independent library for Taskcluster decision tasks Project-independent library for Taskcluster decision tasks
""" """
import datetime
import hashlib import hashlib
import json import json
import os import os
@ -26,6 +27,10 @@ class DecisionTask:
# https://docs.taskcluster.net/docs/reference/workers/docker-worker/docs/features#feature-taskclusterproxy # https://docs.taskcluster.net/docs/reference/workers/docker-worker/docs/features#feature-taskclusterproxy
self.queue_service = taskcluster.Queue(options={"baseUrl": "http://taskcluster/queue/v1/"}) self.queue_service = taskcluster.Queue(options={"baseUrl": "http://taskcluster/queue/v1/"})
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()
def from_now_json(self, offset):
return taskcluster.stringDate(taskcluster.fromNow(offset, dateObj=self.now))
def create_task_with_in_tree_dockerfile(self, *, dockerfile, **kwargs): def create_task_with_in_tree_dockerfile(self, *, dockerfile, **kwargs):
image_build_task = self.build_image(dockerfile) image_build_task = self.build_image(dockerfile)
@ -73,7 +78,7 @@ class DecisionTask:
], ],
extra={ extra={
"index": { "index": {
"expires": taskcluster.fromNowJSON(self.docker_image_cache_expiry), "expires": self.from_now_json(self.docker_image_cache_expiry),
}, },
}, },
) )
@ -116,8 +121,8 @@ class DecisionTask:
"provisionerId": "aws-provisioner-v1", "provisionerId": "aws-provisioner-v1",
"workerType": "servo-docker-worker", "workerType": "servo-docker-worker",
"created": taskcluster.fromNowJSON(""), "created": self.from_now_json(""),
"deadline": taskcluster.fromNowJSON("1 day"), "deadline": self.from_now_json("1 day"),
"metadata": { "metadata": {
"name": "%s: %s" % (self.project_name, task_name), "name": "%s: %s" % (self.project_name, task_name),
"description": "", "description": "",
@ -144,7 +149,7 @@ class DecisionTask:
"public/" + os.path.basename(path): { "public/" + os.path.basename(path): {
"type": "file", "type": "file",
"path": path, "path": path,
"expires": taskcluster.fromNowJSON(expires), "expires": self.from_now_json(expires),
} }
for path, expires in artifacts or [] for path, expires in artifacts or []
}, },