Skip to content

OADP-5316 must gather for 4.15 and 4.14#86304

Merged
xenolinux merged 1 commit intoopenshift:enterprise-4.15from
shdeshpa07:OADP-5316-must-gather-for-4.15
Jan 8, 2025
Merged

OADP-5316 must gather for 4.15 and 4.14#86304
xenolinux merged 1 commit intoopenshift:enterprise-4.15from
shdeshpa07:OADP-5316-must-gather-for-4.15

Conversation

@shdeshpa07
Copy link
Contributor

@shdeshpa07 shdeshpa07 commented Dec 16, 2024

Jira

Updated must-gather image for 4.15 and 4.14. I have used OpenShift Operator Lifecycle doc to update the correct information. I have also attached the OADP screenshot.
image

Version

  • OCP 4.15 and 4.14 only

Preview

QE Review

  • QE has approved this change.

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 16, 2024
@shdeshpa07 shdeshpa07 changed the title OADP-5316 must gather for 4.15 OADP-5316 must gather for 4.15 and 4.14 Dec 16, 2024
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Dec 16, 2024

🤖 Tue Jan 07 13:04:08 - Prow CI generated the docs preview:
https://86304--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@shdeshpa07
Copy link
Contributor Author

/label OADP

@openshift-ci openshift-ci bot added the OADP Label for all OADP PRs label Dec 18, 2024
@shdeshpa07
Copy link
Contributor Author

@anarnold97 - Could you please review the PR? Thanks.

@anarnold97
Copy link
Contributor

LGTM

Copy link

@weshayutin weshayutin left a comment

Choose a reason for hiding this comment

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

/LGTM

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 20, 2024
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 2, 2025
@openshift-ci
Copy link

openshift-ci bot commented Jan 2, 2025

New changes are detected. LGTM label has been removed.

@shdeshpa07 shdeshpa07 force-pushed the OADP-5316-must-gather-for-4.15 branch from 4163e57 to cebbb57 Compare January 2, 2025 05:18
@shdeshpa07
Copy link
Contributor Author

/label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Jan 2, 2025
@xenolinux xenolinux added peer-review-in-progress Signifies that the peer review team is reviewing this PR branch/enterprise-4.15 and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Jan 2, 2025
Copy link
Contributor

@xenolinux xenolinux left a comment

Choose a reason for hiding this comment

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

One tiny nit; otherwise LGTM!

To get these changes merged into 4.14, you need to create a separate PR from the enterprise-4.14 branch because this PR is created from enterprise-4.15

@xenolinux xenolinux added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR labels Jan 2, 2025
@shdeshpa07 shdeshpa07 force-pushed the OADP-5316-must-gather-for-4.15 branch from 6a7e37d to 9bf947d Compare January 3, 2025 05:40
@shdeshpa07
Copy link
Contributor Author

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Jan 6, 2025
@shdeshpa07
Copy link
Contributor Author

One tiny nit; otherwise LGTM!

To get these changes merged into 4.14, you need to create a separate PR from the enterprise-4.14 branch because this PR is created from enterprise-4.15

Hi merge reviewer :), I think we can cherrypick to 4.14 from this PR? Am I right? Please let me know if I need to create a separate PR. Thanks.

@dfitzmau dfitzmau added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Jan 6, 2025
Signed-off-by: Shruti Deshpande <shdeshpa@redhat.com>
@shdeshpa07 shdeshpa07 force-pushed the OADP-5316-must-gather-for-4.15 branch from 1d5d651 to e3bdc6d Compare January 7, 2025 12:40
@openshift-ci
Copy link

openshift-ci bot commented Jan 7, 2025

@shdeshpa07: 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.

@shdeshpa07
Copy link
Contributor Author

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Jan 8, 2025
Copy link
Contributor

@xenolinux xenolinux left a comment

Choose a reason for hiding this comment

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

Merging

:op-system-base: RHEL
:op-system-base-full: Red Hat Enterprise Linux (RHEL)
:op-system-version: 9.x
:op-system-version-9: 9
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
:op-system-version-9: 9
:op-system-version-9: 9.0

Usually we write versions as 7.0, 8.0, 9.0. But I wouldn't hold merge for this.

@xenolinux xenolinux merged commit bd170f2 into openshift:enterprise-4.15 Jan 8, 2025
2 checks passed
@xenolinux xenolinux removed merge-review-in-progress Signifies that the merge review team is reviewing this PR merge-review-needed Signifies that the merge review team needs to review this PR labels Jan 8, 2025
@shdeshpa07
Copy link
Contributor Author

@xenolinux - This needs to be merged into 4.14 as well. I thought we can cherrypick it to 4.14? Similar to how we merge into main and then cherrypick to other enterprise branches. Please let me know. Thanks.

@xenolinux
Copy link
Contributor

@xenolinux - This needs to be merged into 4.14 as well. I thought we can cherrypick it to 4.14? Similar to how we merge into main and then cherrypick to other enterprise branches. Please let me know. Thanks.

@shdeshpa07 AFAIK we don't cherry pick from the enterprise branches. The best known practice is to create a PR from that specific enterprise (4.14 in this case) branch. Once you create a PR from enterprise-4.14, let me know I can merge it.

@shdeshpa07
Copy link
Contributor Author

@xenolinux - This needs to be merged into 4.14 as well. I thought we can cherrypick it to 4.14? Similar to how we merge into main and then cherrypick to other enterprise branches. Please let me know. Thanks.

@shdeshpa07 AFAIK we don't cherry pick from the enterprise branches. The best known practice is to create a PR from that specific enterprise (4.14 in this case) branch. Once you create a PR from enterprise-4.14, let me know I can merge it.

Got it. Thanks for the clarification. I'll create a separate PR and reference this one there. Thanks.

@shdeshpa07 shdeshpa07 mentioned this pull request Jan 8, 2025
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.15 OADP Label for all OADP PRs peer-review-done Signifies that the peer review team has reviewed this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants