From 0208e806d51b922e3d07c0427a4a8968fccd974a Mon Sep 17 00:00:00 2001 From: Tomas David Date: Tue, 24 Feb 2026 12:48:38 +0100 Subject: [PATCH] OCPERT-154: Change urls to Atlassian Cloud --- AGENTS.md | 4 ++-- docs/JIRA_NOTIFICATOR.md | 2 +- oar/core/shipment.py | 6 +++--- oar/core/util.py | 2 +- oar/notificator/jira_notificator.py | 2 +- prow/job/job.py | 4 ++-- tests/test_jira_notificator.py | 2 +- tests/test_notification.py | 2 +- .../release_progress_dashboard.py | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index e21e21e4a86f..303912402996 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -1011,8 +1011,8 @@ See individual agent sections above for specific environment variables required. #### Authentication Issues **Problem:** `JIRA_TOKEN` authentication fails -- **Solution:** Regenerate your Jira personal access token at https://issues.redhat.com -- **Verify:** Test with `curl -H "Authorization: Bearer $JIRA_TOKEN" https://issues.redhat.com/rest/api/2/myself` +- **Solution:** Regenerate your Jira personal access token at https://redhat.atlassian.net/jira +- **Verify:** Test with `curl -H "Authorization: Bearer $JIRA_TOKEN" https://redhat.atlassian.net/jira/rest/api/2/myself` **Problem:** Kerberos ticket expired for Errata Tool access - **Solution:** Renew your Kerberos ticket: `kinit $kid@$domain` diff --git a/docs/JIRA_NOTIFICATOR.md b/docs/JIRA_NOTIFICATOR.md index 41e40fc6b19b..63b9e0ccf7c4 100644 --- a/docs/JIRA_NOTIFICATOR.md +++ b/docs/JIRA_NOTIFICATOR.md @@ -1,5 +1,5 @@ # Jira Notificator -This is copy of [Jira Notificator](https://spaces.redhat.com/spaces/OCPERT/pages/653924138/Jira+Notificator) Confluence article. +This is copy of [Jira Notificator](https://redhat.atlassian.net/wiki/spaces/OCPERT/pages/653924138/Jira+Notificator) Confluence article. ## Overview This Jira Notificator Python script is a command-line tool designed to monitor OCPBUGS jira issues in the ON_QA status and send escalating notifications if they remain in that state for extended periods. It automatically notifies the QA Contact, Team Lead, and Manager in sequence to ensure timely verification of issues. diff --git a/oar/core/shipment.py b/oar/core/shipment.py index 01de61ada4ee..61347c0eb881 100644 --- a/oar/core/shipment.py +++ b/oar/core/shipment.py @@ -147,7 +147,7 @@ def get_jira_issues_from_file(self, file_path: str) -> Set[str]: # Add valid issues to our set for issue in fixed_issues: - if isinstance(issue, dict) and issue.get('source') == 'issues.redhat.com': + if isinstance(issue, dict) and issue.get('source') == 'redhat.atlassian.net/jira': issues.add(issue['id']) except (yaml.YAMLError, KeyError, glom.PathAccessError) as e: @@ -924,7 +924,7 @@ def get_mr(self) -> GitLabMergeRequest: return self._mr def get_jira_issues(self) -> List[str]: - """Get Jira issue IDs from shipment YAML files where source is issues.redhat.com + """Get Jira issue IDs from shipment YAML files where source is redhat.atlassian.net/jira Returns: List[str]: Sorted list of unique Jira issue IDs (e.g. ["OCPBUGS-123", "OCPBUGS-456"]) @@ -1156,7 +1156,7 @@ def _remove_bugs_from_yaml_string(self, yaml_content: str, bugs_to_remove: list[ if f'id: {bug_id}' in line and line.strip().startswith('-'): # Mark this line and the next line (which should contain source) for removal lines_to_remove.add(i) - if i + 1 < len(lines) and 'source: issues.redhat.com' in lines[i + 1]: + if i + 1 < len(lines) and 'source: redhat.atlassian.net/jira' in lines[i + 1]: lines_to_remove.add(i + 1) # Build new content without the removed lines diff --git a/oar/core/util.py b/oar/core/util.py index 7b9f7b769f7a..c09528abf883 100644 --- a/oar/core/util.py +++ b/oar/core/util.py @@ -105,7 +105,7 @@ def init_logging(log_level=logging.INFO): logger.setLevel(logging.CRITICAL) def get_jira_link(key): - return "%s/browse/%s" % ("https://issues.redhat.com", key) + return "%s/browse/%s" % ("https://redhat.atlassian.net/jira", key) def get_advisory_link(advisory): diff --git a/oar/notificator/jira_notificator.py b/oar/notificator/jira_notificator.py index 1f070b9854c1..a58dabd093b5 100644 --- a/oar/notificator/jira_notificator.py +++ b/oar/notificator/jira_notificator.py @@ -706,7 +706,7 @@ def jira_notificator(search_batch_size: int, dry_run: bool, from_date: Optional[ if not jira_token: raise RuntimeError("JIRA token is missing or empty. Please set the JIRA_TOKEN environment variable.") - jira = JIRA(server="https://issues.redhat.com", token_auth=jira_token) + jira = JIRA(server="https://redhat.atlassian.net/jira", token_auth=jira_token) ns = NotificationService(jira, dry_run) ns.process_on_qa_issues(search_batch_size, from_date) diff --git a/prow/job/job.py b/prow/job/job.py index d3a84cdf3f2e..d3d680e6cef3 100644 --- a/prow/job/job.py +++ b/prow/job/job.py @@ -62,7 +62,7 @@ def get_prow_headers(self): # it's for ARM test, now unable to find the 'cli' image in the provided ARM release image, but x86 # so extract the corresponding amd64 version from the arm64 build, - # see bug: https://issues.redhat.com/browse/DPTP-3538, https://issues.redhat.com/browse/OCPQE-17600 + # see bug: https://redhat.atlassian.net/browse/DPTP-3538, https://redhat.atlassian.net/browse/OCPQE-17600 def get_amd_image_for_arm(self, payload): """Function get amd64 image as the ARM platform base image""" version_pattern = re.compile(r':(\d*\.\d{2}\.\d)(-.*)?-') @@ -698,7 +698,7 @@ def get_cmd(job_id, poll): def run_cmd(job_name, payload, upgrade_from, upgrade_to): """Run a job and save results to /tmp/prow-jobs.csv. \n For ARM test, we hard code a x86 image as the base image. - Details: https://issues.redhat.com/browse/DPTP-3538 + Details: https://redhat.atlassian.net/jira/browse/DPTP-3538 """ JOB.run_job(job_name, payload, upgrade_from, upgrade_to) diff --git a/tests/test_jira_notificator.py b/tests/test_jira_notificator.py index 4efa9e625705..c4674dfc96b0 100644 --- a/tests/test_jira_notificator.py +++ b/tests/test_jira_notificator.py @@ -13,7 +13,7 @@ class TestJiraNotificator(unittest.TestCase): def setUp(self): jira_token = os.environ.get("JIRA_TOKEN") - self.jira = JIRA(server="https://issues.redhat.com", token_auth=jira_token) + self.jira = JIRA(server="https://redhat.atlassian.net/jira", token_auth=jira_token) self.ns = NotificationService(self.jira, True) self.test_issue = self.jira.issue("OCPBUGS-59288", expand="changelog") diff --git a/tests/test_notification.py b/tests/test_notification.py index af13b07ce83f..acda950bb14b 100644 --- a/tests/test_notification.py +++ b/tests/test_notification.py @@ -159,7 +159,7 @@ def test_get_slack_message_for_unverified_cve_issues_to_managers(self): unverified_cve_msg, ) self.assertIn( - " <@", + " <@", unverified_cve_msg, ) diff --git a/tools/release_progress_dashboard/release_progress_dashboard.py b/tools/release_progress_dashboard/release_progress_dashboard.py index a4d842a483d1..bde4425b1c7b 100644 --- a/tools/release_progress_dashboard/release_progress_dashboard.py +++ b/tools/release_progress_dashboard/release_progress_dashboard.py @@ -518,7 +518,7 @@ def render_metadata_tabs(release: str, metadata: Dict[str, Any], shipped_data: D with tab3: jira_ticket = metadata.get('jira_ticket', '') if jira_ticket and jira_ticket != 'N/A': - jira_url = f"https://issues.redhat.com/browse/{jira_ticket}" + jira_url = f"https://redhat.atlassian.net/browse/{jira_ticket}" jira_df = pd.DataFrame([ {"Field": "Jira Ticket", "Value": f"[{jira_ticket}]({jira_url})"} ])