Skip to content

USHIFT-6692: Update jira to atlassian#6359

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
kasturinarra:main
Mar 16, 2026
Merged

USHIFT-6692: Update jira to atlassian#6359
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
kasturinarra:main

Conversation

@kasturinarra
Copy link
Contributor

@kasturinarra kasturinarra commented Mar 16, 2026

Migrated from jira to atlassian

knarra@knarra-thinkpadp1gen7:~/automation/Openshift/microshift/scripts/advisory_publication$ sh advisory_publication_report.sh 4.21.6
WARNING: RPMS are still being released via errata, please run `sh advisory_publication_report.sh 4.21.6` from 4.19 branch to see if there are any CVES that effects microshift
{
    "RHBA-2026:16286": {
        "type": "extras",
        "cves": {}
    },
    "RHBA-2026:16666": {
        "type": "image",
        "cves": {}
    },
    "RHBA-2026:16671": {
        "type": "metadata",
        "cves": {}
    }
}

@kasturinarra
Copy link
Contributor Author

@agullon could you please help review ? thanks !!

@coderabbitai
Copy link

coderabbitai bot commented Mar 16, 2026

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Review skipped — only excluded labels are configured. (1)
  • do-not-merge/work-in-progress

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: bd13aacc-888c-4768-a1c1-c594b0c44a20

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

  • ▶️ Resume reviews
  • 🔍 Trigger review

Walkthrough

Replaced Jira-specific environment/config with Atlassian equivalents in docs and code: README and advisory_publication_report.py now use ATLASSIAN_URL, ATLASSIAN_API_TOKEN, and ATLASSIAN_EMAIL; Jira client creation moved to get_jira_server(); ticket search function now accepts an external Jira server parameter.

Changes

Cohort / File(s) Summary
Documentation
scripts/advisory_publication/README.md
Replaced JIRA_API_TOKEN with ATLASSIAN_API_TOKEN, added ATLASSIAN_EMAIL export examples, and updated the Atlassian API token guidance URL.
Advisory report script
scripts/advisory_publication/advisory_publication_report.py
Removed JIRA_URL/JIRA_API_TOKEN; added ATLASSIAN_URL, ATLASSIAN_API_TOKEN, ATLASSIAN_EMAIL; added get_jira_server(); changed search_microshift_tickets to accept server; updated get_report() and main() to obtain/pass the server and validate new env vars; adjusted docstrings/usages.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
📝 Coding Plan
  • Generate coding plan for human review comments

Comment @coderabbitai help to get the list of available commands and usage tips.

Tip

CodeRabbit can generate a title for your PR based on the changes with custom instructions.

Set the reviews.auto_title_instructions setting to generate a title for your PR based on the changes in the PR with custom instructions.

@openshift-ci openshift-ci bot requested review from agullon and vanhalenar March 16, 2026 07:39
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 16, 2026
Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@scripts/advisory_publication/advisory_publication_report.py`:
- Line 31: Fix the typo in the usage/help text by replacing the incorrect string
"ATTLASIAN_API_TOKEN" with the correct environment variable name
"ATLASSIAN_API_TOKEN"; locate the occurrence of "ATTLASIAN_API_TOKEN" in
advisory_publication_report.py (the usage/description text) and update it so any
help output, docs, or env var references use "ATLASSIAN_API_TOKEN" consistently.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: 47a89490-c966-4e08-ad70-c33b2ae49072

📥 Commits

Reviewing files that changed from the base of the PR and between a672de1 and 2faeb3e.

📒 Files selected for processing (2)
  • scripts/advisory_publication/README.md
  • scripts/advisory_publication/advisory_publication_report.py

@kasturinarra kasturinarra changed the title Update jira to atlassian [USHIFT-6692]: Update jira to atlassian Mar 16, 2026
@kasturinarra kasturinarra changed the title [USHIFT-6692]: Update jira to atlassian USHIFT-6692: Update jira to atlassian Mar 16, 2026
@openshift-ci-robot
Copy link

@kasturinarra: An error was encountered searching for bug USHIFT-6692 on the Jira server at https://issues.redhat.com. No known errors were detected, please see the full error message for details.

Full error message. request failed. Please analyze the request body for more details. Status code: 403:

Please contact an administrator to resolve this issue, then request a bug refresh with /jira refresh.

Details

In response to this:

Migrated from jira to atlassian

knarra@knarra-thinkpadp1gen7:~/automation/Openshift/microshift/scripts/advisory_publication$ sh advisory_publication_report.sh 4.21.6
WARNING: RPMS are still being released via errata, please run `sh advisory_publication_report.sh 4.21.6` from 4.19 branch to see if there are any CVES that effects microshift
{
   "RHBA-2026:16286": {
       "type": "extras",
       "cves": {}
   },
   "RHBA-2026:16666": {
       "type": "image",
       "cves": {}
   },
   "RHBA-2026:16671": {
       "type": "metadata",
       "cves": {}
   }
}

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Nitpick comments (1)
scripts/advisory_publication/README.md (1)

30-38: Update the section title to match the new token name.

Line 30 still says “Jira API token” while Lines 35 and 38 use ATLASSIAN_API_TOKEN. This is inconsistent and can confuse setup.

Suggested fix
-### Jira API token
+### Atlassian API token

As per coding guidelines, "Focus on major issues impacting performance, readability, maintainability and security. Avoid nitpicks and avoid verbosity."

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@scripts/advisory_publication/README.md` around lines 30 - 38, Rename the
section header currently reading "Jira API token" to match the environment
variable and product name used in the content—e.g., change the heading to
"Atlassian API token" or "ATLASSIAN_API_TOKEN" so it consistently references
ATLASSIAN_API_TOKEN used in the example export command; update the heading text
where "Jira API token" appears to this new title.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@scripts/advisory_publication/README.md`:
- Around line 37-39: The fenced code block containing export
ATLASSIAN_API_TOKEN="TOKEN_VALUE" is missing a language tag (MD040); update the
opening fence from ``` to ```bash so the block is explicitly marked as bash/sh
and will be syntax-highlighted and lint-clean (locate the block that contains
export ATLASSIAN_API_TOKEN="TOKEN_VALUE" and change the opening backticks to
```bash).

---

Nitpick comments:
In `@scripts/advisory_publication/README.md`:
- Around line 30-38: Rename the section header currently reading "Jira API
token" to match the environment variable and product name used in the
content—e.g., change the heading to "Atlassian API token" or
"ATLASSIAN_API_TOKEN" so it consistently references ATLASSIAN_API_TOKEN used in
the example export command; update the heading text where "Jira API token"
appears to this new title.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: 499d79be-2983-40ae-a146-04f10a030f02

📥 Commits

Reviewing files that changed from the base of the PR and between 3af191b and 25df628.

📒 Files selected for processing (1)
  • scripts/advisory_publication/README.md

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

♻️ Duplicate comments (1)
scripts/advisory_publication/README.md (1)

36-39: ⚠️ Potential issue | 🟡 Minor

Add a language to the fenced shell block.

Line 36 opens a fenced block without a language, which still triggers markdownlint MD040.

Suggested fix
-```
+```bash
 export ATLASSIAN_API_TOKEN="TOKEN_VALUE"
 export ATLASSIAN_EMAIL="your-email@redhat.com"
</details>

<details>
<summary>🤖 Prompt for AI Agents</summary>

Verify each finding against the current code and only fix it if needed.

In @scripts/advisory_publication/README.md around lines 36 - 39, Add a language
identifier to the fenced code block that sets environment variables so
markdownlint MD040 is satisfied: locate the fenced block containing the two
export lines (export ATLASSIAN_API_TOKEN and export ATLASSIAN_EMAIL) in the
README and change the opening fence to include "bash" (i.e., ```bash) so the
block is explicitly marked as shell script.


</details>

</blockquote></details>

</blockquote></details>

<details>
<summary>🤖 Prompt for all review comments with AI agents</summary>

Verify each finding against the current code and only fix it if needed.

Inline comments:
In @scripts/advisory_publication/advisory_publication_report.py:

  • Around line 281-286: The current conditional only treats None as missing for
    ATLASSIAN_API_TOKEN, ATLASSIAN_EMAIL, and GITLAB_API_TOKEN, so empty strings
    slip through; update the check and each subsequent per-variable test to treat
    empty/whitespace-only values as missing (e.g., use a falsy/strip check) when
    populating missing_tokens in the if block that references ATLASSIAN_API_TOKEN,
    ATLASSIAN_EMAIL and GITLAB_API_TOKEN so empty env vars are appended to
    missing_tokens the same as None.

Duplicate comments:
In @scripts/advisory_publication/README.md:

  • Around line 36-39: Add a language identifier to the fenced code block that
    sets environment variables so markdownlint MD040 is satisfied: locate the fenced
    block containing the two export lines (export ATLASSIAN_API_TOKEN and export
    ATLASSIAN_EMAIL) in the README and change the opening fence to include "bash"
    (i.e., ```bash) so the block is explicitly marked as shell script.

</details>

---

<details>
<summary>ℹ️ Review info</summary>

<details>
<summary>⚙️ Run configuration</summary>

**Configuration used**: Repository YAML (base), Organization UI (inherited)

**Review profile**: CHILL

**Plan**: Pro

**Run ID**: `b4f09c2f-4780-4d49-8e9a-8496f9534751`

</details>

<details>
<summary>📥 Commits</summary>

Reviewing files that changed from the base of the PR and between 25df628e272cadcd3190b01ab0d3a2fbce06f947 and 95ee323780932ec692b814201924f9983f176486.

</details>

<details>
<summary>📒 Files selected for processing (2)</summary>

* `scripts/advisory_publication/README.md`
* `scripts/advisory_publication/advisory_publication_report.py`

</details>

</details>

<!-- This is an auto-generated comment by CodeRabbit for review status -->

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

♻️ Duplicate comments (1)
scripts/advisory_publication/README.md (1)

36-39: ⚠️ Potential issue | 🟡 Minor

Add language specifier to fenced code block.

The code block is missing a language identifier (bash).

-```
+```bash
 export ATLASSIAN_API_TOKEN="TOKEN_VALUE"
 export ATLASSIAN_EMAIL="your-email@redhat.com"

<details>
<summary>🤖 Prompt for AI Agents</summary>

Verify each finding against the current code and only fix it if needed.

In @scripts/advisory_publication/README.md around lines 36 - 39, The fenced code
block containing the export statements for ATLASSIAN_API_TOKEN and
ATLASSIAN_EMAIL should include a language specifier; update the block opening
from tobash so it reads as a bash code block, e.g., change the fence
above the lines "export ATLASSIAN_API_TOKEN="TOKEN_VALUE"" and "export
ATLASSIAN_EMAIL="your-email@redhat.com"" to ```bash to enable proper syntax
highlighting.


</details>

</blockquote></details>

</blockquote></details>

<details>
<summary>🤖 Prompt for all review comments with AI agents</summary>

Verify each finding against the current code and only fix it if needed.

Duplicate comments:
In @scripts/advisory_publication/README.md:

  • Around line 36-39: The fenced code block containing the export statements for
    ATLASSIAN_API_TOKEN and ATLASSIAN_EMAIL should include a language specifier;
    update the block opening from tobash so it reads as a bash code block,
    e.g., change the fence above the lines "export
    ATLASSIAN_API_TOKEN="TOKEN_VALUE"" and "export
    ATLASSIAN_EMAIL="your-email@redhat.com"" to ```bash to enable proper syntax
    highlighting.

</details>

---

<details>
<summary>ℹ️ Review info</summary>

<details>
<summary>⚙️ Run configuration</summary>

**Configuration used**: Repository YAML (base), Organization UI (inherited)

**Review profile**: CHILL

**Plan**: Pro

**Run ID**: `ddf560a2-84ca-4aa3-b96f-e52c75f56360`

</details>

<details>
<summary>📥 Commits</summary>

Reviewing files that changed from the base of the PR and between 95ee323780932ec692b814201924f9983f176486 and 2334056775119c7cebefd635e8eb85cd14d00a38.

</details>

<details>
<summary>📒 Files selected for processing (2)</summary>

* `scripts/advisory_publication/README.md`
* `scripts/advisory_publication/advisory_publication_report.py`

</details>

</details>

<!-- This is an auto-generated comment by CodeRabbit for review status -->

@agullon
Copy link
Contributor

agullon commented Mar 16, 2026

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 16, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 16, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: agullon, kasturinarra

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [agullon,kasturinarra]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kasturinarra kasturinarra marked this pull request as draft March 16, 2026 11:16
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 16, 2026
@kasturinarra kasturinarra marked this pull request as ready for review March 16, 2026 11:16
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 16, 2026
@openshift-ci openshift-ci bot requested review from pacevedom and pmtk March 16, 2026 11:16
@agullon
Copy link
Contributor

agullon commented Mar 16, 2026

/override ci/prow/e2e-aws-tests

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 16, 2026

@agullon: Overrode contexts on behalf of agullon: ci/prow/e2e-aws-tests

Details

In response to this:

/override ci/prow/e2e-aws-tests

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 16, 2026

@kasturinarra: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@kasturinarra
Copy link
Contributor Author

/verified by CI

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Mar 16, 2026
@openshift-ci-robot
Copy link

@kasturinarra: This PR has been marked as verified by CI.

Details

In response to this:

/verified by CI

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-merge-bot openshift-merge-bot bot merged commit 910564b into openshift:main Mar 16, 2026
11 checks passed
@kasturinarra
Copy link
Contributor Author

/cherry-pick release-4.19

@openshift-cherrypick-robot

@kasturinarra: #6359 failed to apply on top of branch "release-4.19":

Applying: Update jira to atlassian
Using index info to reconstruct a base tree...
M	scripts/advisory_publication/README.md
M	scripts/advisory_publication/advisory_publication_report.py
Falling back to patching base and 3-way merge...
Auto-merging scripts/advisory_publication/advisory_publication_report.py
CONFLICT (content): Merge conflict in scripts/advisory_publication/advisory_publication_report.py
Auto-merging scripts/advisory_publication/README.md
CONFLICT (content): Merge conflict in scripts/advisory_publication/README.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Update jira to atlassian

Details

In response to this:

/cherry-pick release-4.19

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants