From e21c70b40a062d1d21aee5b1fae59623f5f0ea09 Mon Sep 17 00:00:00 2001 From: Pedro Larroy Date: Tue, 3 Dec 2019 21:40:45 -0800 Subject: [PATCH] Add instance type info to output --- ci/build.py | 6 +++--- ci/util.py | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ci/build.py b/ci/build.py index 8798c7ed2ef2..a21ec44942a8 100755 --- a/ci/build.py +++ b/ci/build.py @@ -268,9 +268,9 @@ def load_docker_cache(tag, docker_registry) -> None: def log_environment(): - instance_id = ec2_instance_id_hostname() - if instance_id: - logging.info("EC2 Instance id: %s", instance_id) + instance_info = ec2_instance_info() + if instance_info: + logging.info("EC2: %s", instance_info) pp = pprint.PrettyPrinter(indent=4) logging.debug("Build environment: %s", pp.pformat(dict(os.environ))) diff --git a/ci/util.py b/ci/util.py index 4b3a399184f9..2b5605e7dfc6 100644 --- a/ci/util.py +++ b/ci/util.py @@ -91,11 +91,14 @@ def under_ci() -> bool: return 'JOB_NAME' in os.environ -def ec2_instance_id_hostname() -> str: +def ec2_instance_info() -> str: import requests if under_ci(): result = [] try: + r = requests.get("http://instance-data/latest/meta-data/instance-type") + if r.status_code == 200: + result.append(r.content.decode()) r = requests.get("http://instance-data/latest/meta-data/instance-id") if r.status_code == 200: result.append(r.content.decode())