From 0fe87f4d7c77aa496625374ca838afdb92ff3522 Mon Sep 17 00:00:00 2001 From: Tomas David Date: Mon, 30 Mar 2026 14:50:37 +0200 Subject: [PATCH 1/2] OCPERT-356: Enable Jira Notificator for 4.22 --- oar/notificator/jira_notificator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oar/notificator/jira_notificator.py b/oar/notificator/jira_notificator.py index e928177e6b2..40e1c990844 100644 --- a/oar/notificator/jira_notificator.py +++ b/oar/notificator/jira_notificator.py @@ -634,7 +634,7 @@ def get_on_qa_filter(self, from_date: Optional[datetime] = None) -> str: base_filter = ( "project = OCPBUGS AND issuetype in (Bug, Vulnerability) " - "AND status = ON_QA AND 'Target Version' in (4.12.z, 4.13.z, 4.14.z, 4.15.z, 4.16.z, 4.17.z, 4.18.z, 4.19.z, 4.20.z, 4.21.z)" + "AND status = ON_QA AND 'Target Version' in (4.12.z, 4.13.z, 4.14.z, 4.15.z, 4.16.z, 4.17.z, 4.18.z, 4.19.z, 4.20.z, 4.21.z, 4.22.z)" ) date_suffix = f" AND status changed to ON_QA after {from_date.strftime('%Y-%m-%d')}" if from_date else "" From 9ff09f6b9648f3aa88cc320d547f9c103dd06a6b Mon Sep 17 00:00:00 2001 From: Tomas David Date: Mon, 30 Mar 2026 15:00:37 +0200 Subject: [PATCH 2/2] Fix tests --- tests/test_jira_notificator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_jira_notificator.py b/tests/test_jira_notificator.py index 94c0a9c90c5..08dc1ed37cf 100644 --- a/tests/test_jira_notificator.py +++ b/tests/test_jira_notificator.py @@ -374,14 +374,14 @@ def test_get_on_qa_filter(self): self.ns.get_on_qa_filter(None), ( "project = OCPBUGS AND issuetype in (Bug, Vulnerability) " - "AND status = ON_QA AND 'Target Version' in (4.12.z, 4.13.z, 4.14.z, 4.15.z, 4.16.z, 4.17.z, 4.18.z, 4.19.z, 4.20.z, 4.21.z)" + "AND status = ON_QA AND 'Target Version' in (4.12.z, 4.13.z, 4.14.z, 4.15.z, 4.16.z, 4.17.z, 4.18.z, 4.19.z, 4.20.z, 4.21.z, 4.22.z)" ) ) self.assertEqual( self.ns.get_on_qa_filter(datetime(2025, 7, 17, tzinfo=timezone.utc)), ( "project = OCPBUGS AND issuetype in (Bug, Vulnerability) " - "AND status = ON_QA AND 'Target Version' in (4.12.z, 4.13.z, 4.14.z, 4.15.z, 4.16.z, 4.17.z, 4.18.z, 4.19.z, 4.20.z, 4.21.z)" + "AND status = ON_QA AND 'Target Version' in (4.12.z, 4.13.z, 4.14.z, 4.15.z, 4.16.z, 4.17.z, 4.18.z, 4.19.z, 4.20.z, 4.21.z, 4.22.z)" " AND status changed to ON_QA after 2025-07-17" ) )