canonical-ubuntu-qa team mailing list archive

[Skia <mp+473717@xxxxxxxxxxxxxxxxxx>]

Skia has proposed merging ~hyask/autopkgtest-cloud:skia/more_github_fixes 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/473717

More fixes for Github integration when used with `testname`.
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~hyask/autopkgtest-cloud:skia/more_github_fixes 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 8b88281..09ade16 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
@@ -87,7 +87,7 @@ ARCH_RELEASE_ALLOW_MAPPING = {
 FAIL_CODES = (4, 6, 12, 14, 20)
 SUCCESS_CODES = (0, 2, 8)
 
-KEYS_FOR_ADDITIONAL_PARAMS = ["all-proposed"]
+KEYS_FOR_ADDITIONAL_PARAMS = ["all-proposed", "testname"]
 
 # In the case of a tmpfail, look for these strings in the log and if they're
 # found, consider this a real failure instead. This is useful if the test
diff --git a/charms/focal/autopkgtest-web/webcontrol/update-github-jobs b/charms/focal/autopkgtest-web/webcontrol/update-github-jobs
index afc4f67..ed81915 100755
--- a/charms/focal/autopkgtest-web/webcontrol/update-github-jobs
+++ b/charms/focal/autopkgtest-web/webcontrol/update-github-jobs
@@ -72,6 +72,15 @@ def result_matches_job(swift_conn, container, result_obj, params):
         )
         return
 
+    if params.get("testname") != info.get("testname"):
+        logging.debug(
+            "exit code: %i, ignoring due to different testnames: %s != %s",
+            exitcode,
+            params.get("testname"),
+            info.get("testname"),
+        )
+        return
+
     logging.debug(
         "exit code: %i, test env matches job: %s", exitcode, result_env
     )