Skip to content

Commit

Permalink
Merge pull request #300 from ashwindasr/fix-regex-microshift
Browse files Browse the repository at this point in the history
[scan-osh] update regex for microshift nightly
  • Loading branch information
openshift-merge-bot[bot] authored Jan 9, 2024
2 parents 37012a8 + f463fc7 commit 9331f7a
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion doozer/doozerlib/cli/scan_osh.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ def get_scan_details_from_ticket(description):
if match:
task_id = match.group("task_id")

pattern = r"\*Build record\*: \[(?P<nvr>[a-z0-9.-]+)\|.+"
pattern = r"\*Build record\*: \[(?P<nvr>[a-z0-9~._-]+)\|.+"
match = re.search(pattern=pattern, string=description)
nvr = None
if match:
Expand Down Expand Up @@ -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"]):
Expand Down

0 comments on commit 9331f7a

Please sign in to comment.