From 28e3321e99bfa5e491ea6c7690ac1b7cce9c0e23 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Fri, 15 Feb 2019 15:33:22 +0100 Subject: [PATCH] Get livelog keys from tc-secrets instead of worker type definition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … in scripts for deploying new Macstadium or Packet.net workers. CC: https://bugzilla.mozilla.org/show_bug.cgi?id=1375182#c6 --- etc/taskcluster/packet.net/tc.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/taskcluster/packet.net/tc.py b/etc/taskcluster/packet.net/tc.py index e9cddd10e6e..355ec4a1a33 100644 --- a/etc/taskcluster/packet.net/tc.py +++ b/etc/taskcluster/packet.net/tc.py @@ -22,8 +22,8 @@ def check(): def livelog(): - win2016 = api("awsProvisioner", "workerType", "servo-win2016") - files = win2016["secrets"]["files"] + win2016 = secret("worker-type:aws-provisioner-v1/servo-win2016") + files = win2016["files"] assert all(f["encoding"] == "base64" for f in files) files = {f.get("description"): f["content"] for f in files} cert = files["SSL certificate for livelog"] @@ -33,7 +33,7 @@ def livelog(): "livelog_key_base64": key, "livelog_cert": base64.b64decode(cert), "livelog_key": base64.b64decode(key), - "livelog_secret": win2016["secrets"]["generic-worker"]["config"]["livelogSecret"], + "livelog_secret": win2016["config"]["livelogSecret"], }