chore(test): print instance id in pytest header

Instance ID is useful to find the instance in the AWS account, but
we only ever log instance IP and hostname.
Let's add it to the pytest header so it's easy to find.

Signed-off-by: Riccardo Mancini <[email protected]>

Author: Manciukic

tests/conftest.py

@@ -77,7 +77,12 @@ def pytest_addoption(parser):
 
 def pytest_report_header():
     """Pytest hook to print relevant metadata in the logs"""
-    return f"EC2 AMI: {global_props.ami}"
+    return "\n".join(
+        [
+            f"EC2 AMI: {global_props.ami}",
+            f"EC2 Instance ID: {global_props.instance_id}",
+        ]
+    )
 
 
 @pytest.hookimpl(wrapper=True, tryfirst=True)

tests/framework/properties.py

@@ -92,9 +92,11 @@ def __init__(self):
         self.environment = self._detect_environment()
         if self.is_ec2:
             self.instance = imdsv2_get("/meta-data/instance-type")
+            self.instance_id = imdsv2_get("/meta-data/instance-id")
             self.ami = imdsv2_get("/meta-data/ami-id")
         else:
             self.instance = "NA"
+            self.instance_id = "NA"
             self.ami = "NA"
 
     @property