Merge autopkgtest-cloud:lxd-container into autopkgtest-cloud:master

[Brian Murray]

Early in the oracular development cycle we had some tests that were supposed to run on oracular (armhf) but ended up running in noble containers. I modified stats.py to collect the container on which the test ran and this seems like it might (but hopefully not!) be useful in the future.

[Tim Andersson (andersson123)]

I'll let skia take this one since stats.py is his baby

review: Abstain

[Skia (hyask)]

Looking good. I would have called everything `lxd_image`, as per https://documentation.ubuntu.com/lxd/en/stable-5.0/howto/instances_create/
When you launch an instance (that we sometimes call container), you need to specify an image, and this is what we get from the command line.
I won't block on that though, but feel free to change if you want, or merge as is.

review: Approve

diff --git a/dev-tools/stats.py b/dev-tools/stats.py
index 743e7a6..43aa039 100755
--- a/dev-tools/stats.py
+++ b/dev-tools/stats.py
@@ -37,6 +37,7 @@ class Run:
         self.log_lines = None
         self.host = None
         self.datacenter = None
+        self.lxd_image = None
         self.first_boot_time = None
         self.boot_attempts = None
 
@@ -52,6 +53,7 @@ class Run:
             "boot_attempts": self.boot_attempts,
             "host": self.host,
             "datacenter": self.datacenter,
+            "lxd_image": self.lxd_image,
         }
 
     def log_url(self):
@@ -90,6 +92,7 @@ class Run:
         - number of reboots
         - number of nova retries
         - datacenter
+        - lxd_image if running on armhf
         """
         self.download_log()
         self.extract_host()
@@ -118,7 +121,9 @@ class Run:
             logging.debug(e)
 
     datacenter_pattern = re.compile(r"@(.*)\.secgroup ")
-    lxd_remote_pattern = re.compile(r"lxd-armhf-(\d*\.\d*\.\d*\.\d*):")
+    lxd_remote_and_image_pattern = re.compile(
+        r"lxd-armhf-(\d*\.\d*\.\d*\.\d*):(.*)"
+    )
 
     def extract_datacenter(self):
         try:
@@ -129,9 +134,10 @@ class Run:
                 in l
             ]
             if self.arch == "armhf":
-                m = self.lxd_remote_pattern.search(lines[0])
+                m = self.lxd_remote_and_image_pattern.search(lines[0])
                 if m:
                     self.datacenter = m.group(1)
+                    self.lxd_image = m.group(2)
             else:
                 m = self.datacenter_pattern.search(lines[0])
                 if m:
@@ -176,6 +182,7 @@ def get_stats(db_con, since_days_ago, until_days_ago, limit):
             "  first_boot_time INTEGER, "
             "  boot_attempts INTEGER, "
             "  datacenter CHAR[10],"
+            "  lxd_image CHAR[10],"
             "  host CHAR[10],"
             "  PRIMARY KEY(uuid))"
         )
@@ -222,14 +229,16 @@ def get_stats(db_con, since_days_ago, until_days_ago, limit):
                             first_boot_time,
                             boot_attempts,
                             host,
-                            datacenter
+                            datacenter,
+                            lxd_image
                         )
                         VALUES (
                             :uuid,
                             :first_boot_time,
                             :boot_attempts,
                             :host,
-                            :datacenter
+                            :datacenter,
+                            :lxd_image
                         )""",
                     r.as_row_dict(),
                 )