Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Always construct TC API URLs from $TASKCLUSTER_PROXY_URL or $TASKCLUSTER_ROOT_URL

Browse source
This commit is contained in:
Simon Sapin 2019-11-05 11:46:17 +01:00
parent 2aca5c82e4
commit 08705345d6
5 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
etc/ci/update-wpt-checkout
View file

@ -100,7 +100,7 @@ function unsafe_open_pull_request() {
git checkout "${BRANCH_NAME}" || return 0 git checkout "${BRANCH_NAME}" || return 0
if [[ -z "${WPT_SYNC_TOKEN+set}" && "${TASKCLUSTER_PROXY_URL+set}" == "set" ]]; then if [[ -z "${WPT_SYNC_TOKEN+set}" && "${TASKCLUSTER_PROXY_URL+set}" == "set" ]]; then
SECRET_RESPONSE=$(curl ${TASKCLUSTER_PROXY_URL}/secrets/v1/secret/project/servo/wpt-sync) SECRET_RESPONSE=$(curl ${TASKCLUSTER_PROXY_URL}/api/secrets/v1/secret/project/servo/wpt-sync)
WPT_SYNC_TOKEN=`echo "${SECRET_RESPONSE}" | jq --raw-output '.secret.token'` WPT_SYNC_TOKEN=`echo "${SECRET_RESPONSE}" | jq --raw-output '.secret.token'`
fi fi

3
etc/taskcluster/decision_task.py
View file

@ -238,7 +238,8 @@ def upload_docs():
.with_scopes("secrets:get:project/servo/doc.servo.org") .with_scopes("secrets:get:project/servo/doc.servo.org")
.with_env(PY="""if 1: .with_env(PY="""if 1:
import urllib, json import urllib, json
url = "http://taskcluster/secrets/v1/secret/project/servo/doc.servo.org" root_url = os.environ["TASKCLUSTER_PROXY_URL"]
url = root_url + "/api/secrets/v1/secret/project/servo/doc.servo.org"
token = json.load(urllib.urlopen(url))["secret"]["token"] token = json.load(urllib.urlopen(url))["secret"]["token"]
open("/root/.git-credentials", "w").write("https://git:%s@github.com/" % token) open("/root/.git-credentials", "w").write("https://git:%s@github.com/" % token)
""") """)

18
etc/taskcluster/decisionlib.py
View file

@ -57,8 +57,8 @@ class Config:
self.git_ref = os.environ.get("GIT_REF") self.git_ref = os.environ.get("GIT_REF")
self.git_sha = os.environ.get("GIT_SHA") self.git_sha = os.environ.get("GIT_SHA")
root_url = os.environ.get("TASKCLUSTER_ROOT_URL") self.tc_root_url = os.environ.get("TASKCLUSTER_ROOT_URL")
self.legacy_tc_deployment = root_url == "https://taskcluster.net" self.legacy_tc_deployment = self.tc_root_url == "https://taskcluster.net"
if self.legacy_tc_deployment: if self.legacy_tc_deployment:
self.default_provisioner_id = "aws-provisioner-v1" self.default_provisioner_id = "aws-provisioner-v1"
@ -99,10 +99,9 @@ class Shared:
self.now = datetime.datetime.utcnow() self.now = datetime.datetime.utcnow()
self.found_or_created_indexed_tasks = {} self.found_or_created_indexed_tasks = {}
# taskclusterProxy URLs: options = {"rootUrl": os.environ["TASKCLUSTER_PROXY_URL"]}
# https://docs.taskcluster.net/docs/reference/workers/docker-worker/docs/features self.queue_service = taskcluster.Queue(options)
self.queue_service = taskcluster.Queue(options={"baseUrl": "http://taskcluster/queue/v1/"}) self.index_service = taskcluster.Index(options)
self.index_service = taskcluster.Index(options={"baseUrl": "http://taskcluster/index/v1/"})
def from_now_json(self, offset): def from_now_json(self, offset):
""" """
@ -621,11 +620,14 @@ class UnixTaskMixin(Task):
""".format(n=n)) """.format(n=n))
def with_curl_artifact_script(self, task_id, artifact_name, out_directory=""): def with_curl_artifact_script(self, task_id, artifact_name, out_directory=""):
if CONFIG.legacy_tc_deployment:
queue_service = "https://queue.taskcluster.net"
else: # pragma: no cover
queue_service = CONFIG.tc_root_url + "/api/queue"
return self \ return self \
.with_dependencies(task_id) \ .with_dependencies(task_id) \
.with_curl_script( .with_curl_script(
"https://queue.taskcluster.net/v1/task/%s/artifacts/public/%s" queue_service + "/v1/task/%s/artifacts/public/%s" % (task_id, artifact_name),
% (task_id, artifact_name),
os.path.join(out_directory, url_basename(artifact_name)), os.path.join(out_directory, url_basename(artifact_name)),
) )

1
etc/taskcluster/mock.py
View file

@ -45,6 +45,7 @@ sys.dont_write_bytecode = True
os.environ.update(**{k: k for k in "TASK_ID TASK_OWNER TASK_SOURCE GIT_URL GIT_SHA".split()}) os.environ.update(**{k: k for k in "TASK_ID TASK_OWNER TASK_SOURCE GIT_URL GIT_SHA".split()})
os.environ["GIT_REF"] = "refs/heads/auto" os.environ["GIT_REF"] = "refs/heads/auto"
os.environ["TASKCLUSTER_ROOT_URL"] = "https://taskcluster.net" os.environ["TASKCLUSTER_ROOT_URL"] = "https://taskcluster.net"
os.environ["TASKCLUSTER_PROXY_URL"] = "http://taskcluster"
import decision_task import decision_task
print("\n# Push:") print("\n# Push:")

2
python/servo/package_commands.py
View file

@ -591,7 +591,7 @@ class PackageCommands(CommandBase):
def get_taskcluster_secret(name): def get_taskcluster_secret(name):
url = ( url = (
os.environ.get("TASKCLUSTER_PROXY_URL", "http://taskcluster") + os.environ.get("TASKCLUSTER_PROXY_URL", "http://taskcluster") +
"/secrets/v1/secret/project/servo/" + "/api/secrets/v1/secret/project/servo/" +
name name
) )
return json.load(urllib.request.urlopen(url))["secret"] return json.load(urllib.request.urlopen(url))["secret"]