diff --git a/etc/taskcluster/packet.net/tc.py b/etc/taskcluster/packet.net/tc.py index 044ab5d79a2..e9cddd10e6e 100644 --- a/etc/taskcluster/packet.net/tc.py +++ b/etc/taskcluster/packet.net/tc.py @@ -26,9 +26,13 @@ def livelog(): files = win2016["secrets"]["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"] + key = files["SSL key for livelog"] return { - "livelog_cert": base64.b64decode(files["SSL certificate for livelog"]), - "livelog_key": base64.b64decode(files["SSL key for livelog"]), + "livelog_cert_base64": cert, + "livelog_key_base64": key, + "livelog_cert": base64.b64decode(cert), + "livelog_key": base64.b64decode(key), "livelog_secret": win2016["secrets"]["generic-worker"]["config"]["livelogSecret"], } diff --git a/etc/taskcluster/packet.net/terraform_with_vars.py b/etc/taskcluster/packet.net/terraform_with_vars.py index 97bac6357af..413cf742db6 100755 --- a/etc/taskcluster/packet.net/terraform_with_vars.py +++ b/etc/taskcluster/packet.net/terraform_with_vars.py @@ -29,7 +29,8 @@ def main(*args): env = dict(os.environ) env["PACKET_AUTH_TOKEN"] = terraform_vars["packet_api_key"] env.update({"TF_VAR_" + k: v for k, v in terraform_vars.items()}) - sys.exit(subprocess.call(["terraform"] + list(args), env=env)) + cwd = os.path.abspath(os.path.dirname(__file__)) + sys.exit(subprocess.call(["terraform"] + list(args), env=env, cwd=cwd)) if __name__ == "__main__":