From f463fc7832f5adbed973fc454e4e1f1e2994958f Mon Sep 17 00:00:00 2001 From: Ashwin Das Date: Tue, 9 Jan 2024 10:11:28 -0500 Subject: [PATCH] [scan-osh] update regex for microshift --- doozer/doozerlib/cli/scan_osh.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doozer/doozerlib/cli/scan_osh.py b/doozer/doozerlib/cli/scan_osh.py index ddaea7940..1e834cc55 100644 --- a/doozer/doozerlib/cli/scan_osh.py +++ b/doozer/doozerlib/cli/scan_osh.py @@ -227,7 +227,7 @@ def get_scan_details_from_ticket(description): if match: task_id = match.group("task_id") - pattern = r"\*Build record\*: \[(?P[a-z0-9.-]+)\|.+" + pattern = r"\*Build record\*: \[(?P[a-z0-9~._-]+)\|.+" match = re.search(pattern=pattern, string=description) nvr = None if match: @@ -583,6 +583,9 @@ def create_update_jira_ticket(self, component): if kind == BuildType.RPM: # Get the build in the currently "open" ticket _, build_nvr_on_ticket = self.get_scan_details_from_ticket(description=issue.fields.description) + + assert build_nvr_on_ticket is not None + build_on_ticket = self.koji_session.getBuild(build_nvr_on_ticket) if int(build_on_ticket["build_id"]) > int(build["build_id"]):