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

Taskcluster: Don’t attempt to write to the index from unprivileged tasks

Browse source
This commit is contained in:
Simon Sapin 2019-01-07 15:06:56 +01:00
parent bc366d01a8
commit 7a628080ec
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
etc/taskcluster/decision_task.py
View file

@ -74,6 +74,7 @@ def main(task_for):
elif task_for == "github-pull-request": elif task_for == "github-pull-request":
CONFIG.treeherder_repository_name = "servo-prs" CONFIG.treeherder_repository_name = "servo-prs"
CONFIG.index_read_only = True
# We want the merge commit that GitHub creates for the PR. # We want the merge commit that GitHub creates for the PR.
# The event does contain a `pull_request.merge_commit_sha` key, but it is wrong: # The event does contain a `pull_request.merge_commit_sha` key, but it is wrong:

3
etc/taskcluster/decisionlib.py
View file

@ -38,6 +38,7 @@ class Config:
def __init__(self): def __init__(self):
self.task_name_template = "%s" self.task_name_template = "%s"
self.index_prefix = "garbage.servo-decisionlib" self.index_prefix = "garbage.servo-decisionlib"
self.index_read_only = False
self.scopes_for_all_subtasks = [] self.scopes_for_all_subtasks = []
self.routes_for_all_subtasks = [] self.routes_for_all_subtasks = []
self.docker_image_buil_worker_type = None self.docker_image_buil_worker_type = None
@ -265,7 +266,7 @@ class Task:
except taskcluster.TaskclusterRestFailure as e: except taskcluster.TaskclusterRestFailure as e:
if e.status_code != 404: # pragma: no cover if e.status_code != 404: # pragma: no cover
raise raise
# FIXME: skip for untrusted tasks that don’t have the scope to do this? if not CONFIG.index_read_only:
self.routes.append("index.%s.%s" % (CONFIG.index_prefix, index_path)) self.routes.append("index.%s.%s" % (CONFIG.index_prefix, index_path))
task_id = self.create() task_id = self.create()

6
etc/taskcluster/mock.py
View file

@ -46,9 +46,6 @@ 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"
import decision_task import decision_task
print("\n# PR:")
decision_task.main("github-pull-request")
print("\n# Push:") print("\n# Push:")
decision_task.main("github-push") decision_task.main("github-push")
@ -65,4 +62,7 @@ decision_task.main("github-push")
print("\n# Daily:") print("\n# Daily:")
decision_task.main("daily") decision_task.main("daily")
print("\n# PR:")
decision_task.main("github-pull-request")
print() print()