From 88509d1c8e70d596e7c1225d8f418ade6c42b644 Mon Sep 17 00:00:00 2001 From: Pedro Larroy Date: Fri, 21 Feb 2020 00:23:59 -0800 Subject: [PATCH] add AMI id to instance info on builds --- ci/util.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/ci/util.py b/ci/util.py index a2dfe82bd377..1dcfc4e9f284 100644 --- a/ci/util.py +++ b/ci/util.py @@ -96,18 +96,19 @@ def under_ci() -> bool: def ec2_instance_info() -> str: import requests + urls = [ + "http://instance-data/latest/meta-data/instance-type", + "http://instance-data/latest/meta-data/instance-id", + "http://instance-data/latest/meta-data/public-hostname", + "http://instance-data/latest/meta-data/ami-id" + ] 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()) - r = requests.get("http://instance-data/latest/meta-data/public-hostname") - if r.status_code == 200: - result.append(r.content.decode()) + for url in urls: + r = requests.get(url) + if r.status_code == 200: + result.append(r.content.decode()) return ' '.join(result) except ConnectionError: pass