Skip to content

Commit

Permalink
[red-hat-openshift] Fix pattern (#379)
Browse files Browse the repository at this point in the history
The Red Hat people changed the format of the dates AND the format of the versions from this:

=== RHSA-2024:5808 - {product-title} 4.12.64 bug fix and security update

to this

=== RHSA-2024:0041 - {product-title} {product-version}.0 image release, bug fix, and security update advisory.

But not for all branches, but only for the latest (4.16 and up).

Fixes #378
  • Loading branch information
dadav authored Sep 6, 2024
1 parent 7338d85 commit 9e073c2
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions src/red-hat-openshift.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,20 @@

"""Fetches Red Hat OpenShift versions from the documentation's git repository"""

VERSION_AND_DATE_PATTERN = re.compile(r"{product-title}\s(?P<version>\d+\.\d+\.\d+).*\n+Issued:\s(?P<date>\d{4}-\d\d-\d\d)$", re.MULTILINE)
VERSION_AND_DATE_PATTERN = re.compile(
r"{product-title}\s(?P<version>{product-version}\.\d+|\d+\.\d+\.\d+).*\n+Issued:\s(?P<date>\d\d?\s[a-zA-Z]+\s\d{4}|\d{4}-\d\d-\d\d)$",
re.MULTILINE,
)

with releasedata.ProductData("red-hat-openshift") as product_data:
git = Git("https://github.com/openshift/openshift-docs.git")
git.setup()

# only fetch v4+ branches, because the format was different in openshift v3
for branch in git.list_branches("refs/heads/enterprise-[4-9]*"):
version = branch.split("-")[1].replace(".", "-")
release_notes_filename = f"release_notes/ocp-{version}-release-notes.adoc"
branch_version = branch.split("-")[1]
file_version = branch_version.replace(".", "-")
release_notes_filename = f"release_notes/ocp-{file_version}-release-notes.adoc"
git.checkout(branch, file_list=[release_notes_filename])

release_notes_file = git.repo_dir / release_notes_filename
Expand All @@ -23,5 +27,8 @@

with release_notes_file.open("rb") as f:
content = f.read().decode("utf-8")
for (version, date_str) in VERSION_AND_DATE_PATTERN.findall(content):
product_data.declare_version(version, dates.parse_date(date_str))
for version, date_str in VERSION_AND_DATE_PATTERN.findall(content):
product_data.declare_version(
version.replace("{product-version}", branch_version),
dates.parse_date(date_str),
)

0 comments on commit 9e073c2

Please sign in to comment.