canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+459803@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:another-github-jobs-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/459803
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:another-github-jobs-fix into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-web/webcontrol/update-github-jobs b/charms/focal/autopkgtest-web/webcontrol/update-github-jobs
index ff02ca2..00b56ea 100755
--- a/charms/focal/autopkgtest-web/webcontrol/update-github-jobs
+++ b/charms/focal/autopkgtest-web/webcontrol/update-github-jobs
@@ -18,6 +18,19 @@ MAX_DAY_DIFF = 30
 
 
 def result_matches_job(swift_conn, container, result_obj, params):
+    # before we check the environment variables, let's first check that the
+    # arch, release and package are correct
+    obj_split = result_obj.split("/")
+    if not (
+        params["release"] == obj_split[0]
+        and params["arch"] == obj_split[1]
+        and params["package"] == obj_split[3]
+    ):
+        logging.debug(
+            "arch release and package don't match this swift object for this job, ignoring"
+        )
+        return
+
     _, contents = swift_conn.get_object(container, result_obj)
     tar_bytes = io.BytesIO(contents)
     try: