canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+465166@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:stop-looping-fix 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/465166
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:stop-looping-fix 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 903e31d..af3b906 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
@@ -345,7 +345,7 @@ def process_output_dir(
     # In failure cases where we don't know the version, write 'unknown' out as
     # the version, so that frontends (e.g. autopkgtest-web, or britney) can
     # display the result.
-    if code in FAIL_CODES and "testpkg-version" not in files:
+    if (code in FAIL_CODES or code == 16) and "testpkg-version" not in files:
         logging.warning(
             'Code %d returned and no testpkg-version - returning "unknown" for %s'
             % (code, pkgname)