From f692cfee28d27f599b05ae03d0698eaca77ea705 Mon Sep 17 00:00:00 2001
From: Jameer Pathan <21165044+jameerpathan111@users.noreply.github.com>
Date: Thu, 5 Dec 2024 15:15:57 +0100
Subject: [PATCH] Update Jira ON_QA status for Jira issue handler (#16721)

(cherry picked from commit a2f2587620c35c176ec98521c420c4e4be111a07)
---
 conf/jira.yaml.template         |  2 +-
 robottelo/config/validators.py  |  2 +-
 robottelo/constants/__init__.py | 12 ++++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/conf/jira.yaml.template b/conf/jira.yaml.template
index 9c90993fe2d..93a863509db 100644
--- a/conf/jira.yaml.template
+++ b/conf/jira.yaml.template
@@ -7,4 +7,4 @@ JIRA:
   COMMENT_VISIBILITY: "Red Hat Employee"
   ENABLE_COMMENT: false
   # Comment only if jira is in one of the following state
-  ISSUE_STATUS: ["Review", "Release Pending"]
+  ISSUE_STATUS: ["Testing", "Release Pending"]
diff --git a/robottelo/config/validators.py b/robottelo/config/validators.py
index 7899b5944ef..e9606da2c97 100644
--- a/robottelo/config/validators.py
+++ b/robottelo/config/validators.py
@@ -189,7 +189,7 @@
         Validator('jira.comment_type', default="group"),
         Validator('jira.comment_visibility', default="Red Hat Employee"),
         Validator('jira.enable_comment', default=False),
-        Validator('jira.issue_status', default=["Review", "Release Pending"]),
+        Validator('jira.issue_status', default=["Testing", "Release Pending"]),
     ],
     ldap=[
         Validator(
diff --git a/robottelo/constants/__init__.py b/robottelo/constants/__init__.py
index a741709fa21..7fa2d9abd79 100644
--- a/robottelo/constants/__init__.py
+++ b/robottelo/constants/__init__.py
@@ -1729,8 +1729,16 @@
 # Jira statuses used by Robottelo issue handler.
 JIRA_TESTS_PASSED_LABEL = "tests-passed"
 JIRA_TESTS_FAILED_LABEL = "tests-failed"
-JIRA_OPEN_STATUSES = ("New", "Backlog", "Refinement", "To Do", "In Progress")
-JIRA_ONQA_STATUS = "Review"
+JIRA_OPEN_STATUSES = (
+    "New",
+    "Backlog",
+    "Refinement",
+    "To Do",
+    "In Progress",
+    "Review",
+    "Release Pending - Upstream",
+)
+JIRA_ONQA_STATUS = "Testing"
 JIRA_CLOSED_STATUSES = ("Release Pending", "Closed")
 JIRA_WONTFIX_RESOLUTIONS = "Obsolete"