From b7c1c8d7f207bc93ad1d7541a0afd97398deb614 Mon Sep 17 00:00:00 2001 From: Pedro Larroy Date: Mon, 24 Feb 2020 17:09:53 -0800 Subject: [PATCH] [CI] Add AMI id to instance info on builds (#17649) --- ci/build_windows.py | 3 +++ ci/util.py | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ci/build_windows.py b/ci/build_windows.py index b334b68fef2c..2590d211c671 100755 --- a/ci/build_windows.py +++ b/ci/build_windows.py @@ -221,6 +221,9 @@ def main(): logging.getLogger().setLevel(logging.INFO) logging.basicConfig(format='%(asctime)-15s %(message)s') logging.info("MXNet Windows build helper") + instance_info = ec2_instance_info() + if instance_info: + logging.info("EC2: %s", instance_info) parser = argparse.ArgumentParser() parser.add_argument("-o", "--output", 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