canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+464917@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:three-tmpfails-no-looping-please into autopkgtest-cloud:master.

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

For more details, see:
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/464917
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:three-tmpfails-no-looping-please into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
index 0e1e431..0939467 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
@@ -1334,20 +1334,10 @@ def request(msg):
                     )
                     code = 4
                 else:
-                    # 2022-07-05 what code is passed to submit_metric in this code path?
-                    submit_metric(
-                        architecture,
-                        code,
-                        pkgname,
-                        current_region,
-                        False,
-                        release,
-                    )
-                    logging.error(
-                        "Three tmpfails in a row, aborting worker. Log follows:"
+                    logging.warning(
+                        "Three testbed failures in a row - considering this a real failure rather than tmpfail"
                     )
-                    logging.error(log_contents(out_dir))
-                    sys.exit(99)
+                    code = 16
 
             duration = int(time.time() - retry_start_time)