canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+456883@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:test-name 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/456883
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:test-name 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 980d63b..969709c 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
@@ -335,6 +335,8 @@ def process_output_dir(dir, pkgname, code, triggers):
         # we might need to fake testinfo.json up too, depending on how
         # autopkgtest failed. britney uses this to associate results with
         # requests
+
+        # need to use the changes in the all-proposed MP here.
         if "testinfo.json" not in files and triggers:
             logging.warning("...testinfo.json is missing too, faking one up")
             triggers = " ".join(triggers)
@@ -726,6 +728,9 @@ def request(msg):
             argv = ["autopkgtest"]
         argv += ["--output-dir", out_dir, "--timeout-copy=6000"]
 
+        if params.get("test-name"):
+            argv += ["--test-name", params.get("test-name")]
+
         if i386_cross_series(release) and architecture == "i386":
             argv += ["-a", "i386"]
 
@@ -1214,6 +1219,9 @@ def request(msg):
 
             duration = int(time.time() - retry_start_time)
 
+        if params.get("test-name"):
+            code = 20  # "other unexpected failures including bad usage" from autopkgtest man page
+
         logging.info("autopkgtest exited with code %i", code)
         submit_metric(
             architecture, code, pkgname, current_region, False, release