From d39bbf6e101d96bb0fb5ae30e5130e0aa016de17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20Flore-Th=C3=A9bault?= Date: Mon, 12 Jan 2026 10:34:50 +0100 Subject: [PATCH 1/2] RHIDP-9831 - Fix release notes script behavior. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add links to Jira only in Known issues and bug fixes. * Search also in the RHDHPLAN project. * Adapt search to find issues when affectVersion is a list rather than a single value. Signed-off-by: Fabrice Flore-Thébault --- ...gle-source-release-notes.jira2asciidoc.yml | 25 +++++++++---------- .../single-source-release-notes.py | 2 ++ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/modules/release-notes/single-source-release-notes.jira2asciidoc.yml b/modules/release-notes/single-source-release-notes.jira2asciidoc.yml index 6fe74a75a2..064af7f2a2 100644 --- a/modules/release-notes/single-source-release-notes.jira2asciidoc.yml +++ b/modules/release-notes/single-source-release-notes.jira2asciidoc.yml @@ -7,7 +7,7 @@ sections: description: | This section highlights new features in {product} {product-version}. query: > - project in (RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP) + project in (RHDHPLAN, RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP) AND "Release Note Status" = "Done" AND level is EMPTY AND status in (Closed, "Release Pending") @@ -21,7 +21,7 @@ sections: description: | This section lists breaking changes in {product} {product-version}. query: > - project in (RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP) + project in (RHDHPLAN, RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP) AND "Release Note Status" = "Done" AND level is EMPTY AND status in (Closed, "Release Pending") @@ -29,13 +29,13 @@ sections: AND fixVersion >= "{version_minor}" AND fixVersion <= "{version_patch}" ORDER BY key - template: with-jira-link + template: without-jira-link - id: deprecated-functionalities title: Deprecated functionalities description: | This section lists deprecated functionalities in {product} {product-version}. query: > - project in (RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP) + project in (RHDHPLAN, RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP) AND "Release Note Status" = "Done" AND level is EMPTY AND status in (Closed, "Release Pending") @@ -43,7 +43,7 @@ sections: AND fixVersion >= "{version_minor}" AND fixVersion <= "{version_patch}" ORDER BY key - template: with-jira-link + template: without-jira-link - id: technology-preview title: Technology Preview description: | @@ -57,7 +57,7 @@ sections: See: link:https://access.redhat.com/support/offerings/techpreview/[Technology Preview support scope]. ==== query: > - project in (RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP) + project in (RHDHPLAN, RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP) AND "Release Note Status" = "Done" AND level is EMPTY AND status in (Closed, "Release Pending") @@ -65,7 +65,7 @@ sections: AND fixVersion >= "{version_minor}" AND fixVersion <= "{version_patch}" ORDER BY key - template: with-jira-link + template: without-jira-link - id: developer-preview title: Developer Preview description: | @@ -78,7 +78,7 @@ sections: For more information about the support scope of Red Hat Developer Preview features, see link:https://access.redhat.com/support/offerings/devpreview/[Developer Preview Support Scope]. ==== query: > - project in (RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP) + project in (RHDHPLAN, RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP) AND "Release Note Status" = "Done" AND level is EMPTY AND status in (Closed, "Release Pending") @@ -86,13 +86,13 @@ sections: AND fixVersion >= "{version_minor}" AND fixVersion <= "{version_patch}" ORDER BY key - template: with-jira-link + template: without-jira-link - id: fixed-issues title: Fixed issues description: | This section lists issues fixed in {product} {product-version}. query: > - project in (RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP) + project in (RHDHPLAN, RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP) AND "Release Note Status" = "Done" AND level is EMPTY AND status in (Closed, "Release Pending") @@ -106,12 +106,11 @@ sections: description: | This section lists known issues in {product} {product-version}. query: > - project in (RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP) + project in (RHDHPLAN, RHIDP, RHDHBUGS, RHDHPAI, RHDHSUPP) AND "Release Note Status" = "Done" AND level is EMPTY AND "Release Note Type" in ("Known Issue") - AND affectedVersion >= "{version_minor}" - AND affectedVersion <= "{version_patch}" + AND affectedVersion ~ "{version_minor_matchall}" AND (fixVersion > "{version_patch}" OR fixVersion is EMPTY) ORDER BY key DESC template: with-jira-link diff --git a/modules/release-notes/single-source-release-notes.py b/modules/release-notes/single-source-release-notes.py index 8f8f720d98..7cc4780b5c 100755 --- a/modules/release-notes/single-source-release-notes.py +++ b/modules/release-notes/single-source-release-notes.py @@ -60,6 +60,7 @@ attributes[items[1]] = items[2].strip() product_version_minor = attributes["product-version"] + ".0" +product_version_minor_matchall = attributes["product-version"] + ".*" product_version_patch = attributes["product-bundle-version"] # Load the configuration file to get the sections and their Jira queries. @@ -85,6 +86,7 @@ # Search in Jira for issues to publish defined in jira_query query = section["query"].format( version_minor=product_version_minor, + version_minor_matchall=product_version_minor_matchall, version_patch=product_version_patch ) print(query) From b738c21afb904dbd12f56250b0918a58d66831c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20Flore-Th=C3=A9bault?= Date: Mon, 12 Jan 2026 15:26:30 +0100 Subject: [PATCH 2/2] additional stuff found when testing on release-1.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabrice Flore-Thébault --- .../single-source-release-notes.jira2asciidoc.yml | 3 +-- modules/release-notes/single-source-release-notes.py | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/release-notes/single-source-release-notes.jira2asciidoc.yml b/modules/release-notes/single-source-release-notes.jira2asciidoc.yml index 064af7f2a2..448b3f4aa1 100644 --- a/modules/release-notes/single-source-release-notes.jira2asciidoc.yml +++ b/modules/release-notes/single-source-release-notes.jira2asciidoc.yml @@ -97,8 +97,7 @@ sections: AND level is EMPTY AND status in (Closed, "Release Pending") AND "Release Note Type" = "Bug Fix" - AND fixVersion >= "{version_minor}" - AND fixVersion <= "{version_patch}" + AND fixVersion ~ "{version_minor_matchall}" ORDER BY fixVersion DESC,key template: with-z-stream-section - id: known-issues diff --git a/modules/release-notes/single-source-release-notes.py b/modules/release-notes/single-source-release-notes.py index 7cc4780b5c..6f01961a1e 100755 --- a/modules/release-notes/single-source-release-notes.py +++ b/modules/release-notes/single-source-release-notes.py @@ -31,7 +31,6 @@ import jinja2 import yaml from jira import JIRA -from setuptools.dist import sequence # Define location for product attributes, templates, and generated files. script_dir = os.path.normpath(