canonical-ubuntu-qa team mailing list archive

[Brian Murray <mp+446336@xxxxxxxxxxxxxxxxxx>]

Brian Murray has proposed merging autopkgtest-cloud:dotall into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~ubuntu-release/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/446336

The queue items in amqp contain a '\n' in them so using a regex of "debvm.*openssh" will not match without this fix. While you could expand the regex to "debvm\n.*openssh" that seems easy to forget.

Before the change:

./filter-amqp --dry-run debci-huge-mantic-arm64 "debvm.*openssh"


After the change:

./filter-amqp --dry-run debci-huge-mantic-arm64 "debvm.*openssh"
2023-07-07 20:23:38,640 - queue item: b'debvm{"triggers": ["openssh/1:9.3p1-1ubuntu1"], "submit-time": "2023-07-06 18:53:33"}' (would delete)
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of autopkgtest-cloud:dotall into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/filter-amqp b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/filter-amqp
index 76e51ca..2aba358 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/filter-amqp
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/filter-amqp
@@ -11,7 +11,7 @@ import amqplib.client_0_8 as amqp
 
 def filter_amqp(options, host, queue_name, regex):
     url_parts = urllib.parse.urlsplit(host, allow_fragments=False)
-    filter_re = re.compile(regex.encode("UTF-8"))
+    filter_re = re.compile(regex.encode("UTF-8"), re.DOTALL)
     amqp_con = amqp.Connection(
         url_parts.hostname,
         userid=url_parts.username,