Add instance type info to output

apache · Dec 26, 2019 · 1a12609 · 1a12609
1 parent 1fc2cd0
commit 1a12609
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -94,11 +94,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())