canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+462134@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:fix-arch-release-allow-mapping-traceback 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/462134
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:fix-arch-release-allow-mapping-traceback 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 9ff2ff1..5f62499 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
@@ -360,8 +360,11 @@ def process_output_dir(
             files.add("testinfo.json")
 
     d = {}
-    with open(os.path.join(dir, "testinfo.json"), "r") as testinfo:
-        d = json.load(testinfo)
+    # we have to first check this file exists - when a package is marked with
+    # dont_run for whatever reason, the file doesn't exist
+    if os.path.isfile(os.path.join(dir, "testinfo.json")):
+        with open(os.path.join(dir, "testinfo.json"), "r") as testinfo:
+            d = json.load(testinfo)
     d["uuid"] = test_uuid
     for key in KEYS_FOR_ADDITIONAL_PARAMS:
         d[key] = additional_params.get(key)
@@ -705,6 +708,9 @@ def request(msg):
                 testpkg_version.write(
                     f'Package blacklisted we only run {",".join(ARCH_RELEASE_ALLOW_MAPPING[release.lower()])} tests for {release.lower()}'
                 )
+            # with open(
+            #     os.path.join()
+            # )
             dont_run = True
         elif request_matches_per_package(
             pkgname, architecture, release, never_run