canonical-ubuntu-qa team mailing list archive

[Skia <mp+463596@xxxxxxxxxxxxxxxxxx>]

Skia has proposed merging ~hyask/autopkgtest-cloud:skia/fix_metrics into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~hyask/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/463596

Two small fixes for issues I've seen on LXD worker.
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~hyask/autopkgtest-cloud:skia/fix_metrics into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/metrics b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/metrics
index 90ca1a3..aefc9ff 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/metrics
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/metrics
@@ -155,8 +155,8 @@ def get_remotes():
                 )
                 noncluster_counts[arch][0] += 1
                 functional_ips.append(r.replace(prefix, ""))
-            except subprocess.CalledProcessError:
-                noncluster_counts[arch][0] += 1
+            except (subprocess.CalledProcessError, subprocess.TimeoutExpired):
+                noncluster_counts[arch][1] += 1
 
     cluster_status = make_submission(
         cluster_counts, "autopkgtest_cluster_status"