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

generic-worker on macOS: configure livelog

Browse source
This commit is contained in:
Simon Sapin 2018-11-12 22:34:33 +01:00
parent a5089885ac
commit ff1e2c2394
4 changed files with 32 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
etc/taskcluster/packet.net/tc.py
View file

@ -5,6 +5,7 @@
import os
import sys
import json
import base64
import subprocess
@ -20,6 +21,18 @@ def check():
"eval `taskcluster signin`\n")
def livelog():
win2016 = api("awsProvisioner", "workerType", "servo-win2016")
files = win2016["secrets"]["files"]
assert all(f["encoding"] == "base64" for f in files)
files = {f.get("description"): f["content"] for f in files}
return {
"livelog_cert": base64.b64decode(files["SSL certificate for livelog"]),
"livelog_key": base64.b64decode(files["SSL key for livelog"]),
"livelog_secret": win2016["secrets"]["generic-worker"]["config"]["livelogSecret"],
}
def packet_auth_token():
return secret("project/servo/packet.net-api-key")["key"]

13
etc/taskcluster/packet.net/terraform_with_vars.py
View file

@ -6,7 +6,6 @@
import os
import sys
import base64
import subprocess
import tc
@ -16,13 +15,7 @@ def main(*args):
tc.check()
ssh_key = tc.secret("project/servo/ssh-keys/docker-worker-kvm")
tc_creds = tc.secret("project/servo/tc-client/worker/docker-worker-kvm/1")
win2016 = tc.api("awsProvisioner", "workerType", "servo-win2016")
files_by_desc = {f.get("description"): f for f in win2016["secrets"]["files"]}
def decode(description):
f = files_by_desc[description]
assert f["encoding"] == "base64"
return base64.b64decode(f["content"])
livelog = tc.livelog()
terraform_vars = dict(
ssh_pub_key=ssh_key["public"],
@ -30,8 +23,8 @@ def main(*args):
taskcluster_client_id=tc_creds["client_id"],
taskcluster_access_token=tc_creds["access_token"],
packet_api_key=tc.packet_auth_token(),
ssl_certificate=decode("SSL certificate for livelog"),
cert_key=decode("SSL key for livelog"),
ssl_certificate=livelog["livelog_cert_base64"],
cert_key=livelog["livelog_key_base64"],
)
env = dict(os.environ)
env["PACKET_AUTH_TOKEN"] = terraform_vars["packet_api_key"]