Skip to content

cqa fixes for must gather#107888

Merged
shdeshpa07 merged 1 commit intoopenshift:mainfrom
shdeshpa07:oadp-7339-must-gather
Mar 13, 2026
Merged

cqa fixes for must gather#107888
shdeshpa07 merged 1 commit intoopenshift:mainfrom
shdeshpa07:oadp-7339-must-gather

Conversation

@shdeshpa07
Copy link
Copy Markdown
Contributor

@shdeshpa07 shdeshpa07 commented Mar 4, 2026

Jira

OADP-7339

This PR contains fixes for must-gather assembly for callouts, short desc, block titles, and other CQA work.

Version

OCP 4.14 → OCP 4.22

Preview

must gather

@openshift-ci openshift-ci Bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 4, 2026
@ocpdocs-previewbot
Copy link
Copy Markdown

ocpdocs-previewbot commented Mar 4, 2026

@shdeshpa07
Copy link
Copy Markdown
Contributor Author

@vashirova - Can I please ask for a peer review of the PR? Thanks. copy @anarnold97.

Copy link
Copy Markdown
Member

@vashirova vashirova left a comment

Choose a reason for hiding this comment

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

@shdeshpa07 peer review completed. Same tiny suggestion on the markup in one file, otherwise LGTM.

Comment thread modules/using-must-gather.adoc
Comment thread modules/using-must-gather.adoc
@shdeshpa07 shdeshpa07 added the OADP Label for all OADP PRs label Mar 6, 2026
Signed-off-by: Shruti Deshpande <shdeshpa@redhat.com>
@shdeshpa07 shdeshpa07 force-pushed the oadp-7339-must-gather branch from 803d9cb to 32e3d8d Compare March 6, 2026 11:05
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Mar 6, 2026

@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
Copy Markdown
Contributor Author

/cherrypick enterprise-4.22

@shdeshpa07
Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.21

@shdeshpa07
Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.20

@shdeshpa07
Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.19

@shdeshpa07
Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.18

@shdeshpa07
Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.17

@shdeshpa07
Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.16

@shdeshpa07
Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.15

@openshift-cherrypick-robot
Copy link
Copy Markdown

@shdeshpa07: new pull request created: #108281

Details

In response to this:

/cherrypick enterprise-4.22

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.

@shdeshpa07
Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.14

@openshift-cherrypick-robot
Copy link
Copy Markdown

@shdeshpa07: new pull request created: #108282

Details

In response to this:

/cherrypick enterprise-4.21

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-cherrypick-robot
Copy link
Copy Markdown

@shdeshpa07: new pull request created: #108283

Details

In response to this:

/cherrypick enterprise-4.20

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-cherrypick-robot
Copy link
Copy Markdown

@shdeshpa07: new pull request created: #108284

Details

In response to this:

/cherrypick enterprise-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.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@shdeshpa07: #107888 failed to apply on top of branch "enterprise-4.18":

Applying: cqa fixes for must gather
Using index info to reconstruct a base tree...
M	backup_and_restore/application_backup_and_restore/troubleshooting/using-the-must-gather-tool.adoc
M	modules/using-must-gather.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/using-must-gather.adoc
CONFLICT (content): Merge conflict in modules/using-must-gather.adoc
Auto-merging backup_and_restore/application_backup_and_restore/troubleshooting/using-the-must-gather-tool.adoc
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 cqa fixes for must gather

Details

In response to this:

/cherrypick enterprise-4.18

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-cherrypick-robot
Copy link
Copy Markdown

@shdeshpa07: #107888 failed to apply on top of branch "enterprise-4.17":

Applying: cqa fixes for must gather
Using index info to reconstruct a base tree...
M	backup_and_restore/application_backup_and_restore/troubleshooting/using-the-must-gather-tool.adoc
M	modules/using-must-gather.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/using-must-gather.adoc
CONFLICT (content): Merge conflict in modules/using-must-gather.adoc
Auto-merging backup_and_restore/application_backup_and_restore/troubleshooting/using-the-must-gather-tool.adoc
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 cqa fixes for must gather

Details

In response to this:

/cherrypick enterprise-4.17

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-cherrypick-robot
Copy link
Copy Markdown

@shdeshpa07: #107888 failed to apply on top of branch "enterprise-4.16":

Applying: cqa fixes for must gather
Using index info to reconstruct a base tree...
M	backup_and_restore/application_backup_and_restore/troubleshooting/using-the-must-gather-tool.adoc
M	modules/using-must-gather.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/using-must-gather.adoc
CONFLICT (content): Merge conflict in modules/using-must-gather.adoc
Auto-merging backup_and_restore/application_backup_and_restore/troubleshooting/using-the-must-gather-tool.adoc
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 cqa fixes for must gather

Details

In response to this:

/cherrypick enterprise-4.16

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-cherrypick-robot
Copy link
Copy Markdown

@shdeshpa07: #107888 failed to apply on top of branch "enterprise-4.15":

Applying: cqa fixes for must gather
Using index info to reconstruct a base tree...
M	backup_and_restore/application_backup_and_restore/troubleshooting/using-the-must-gather-tool.adoc
M	modules/using-must-gather.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/using-must-gather.adoc
CONFLICT (content): Merge conflict in modules/using-must-gather.adoc
Auto-merging backup_and_restore/application_backup_and_restore/troubleshooting/using-the-must-gather-tool.adoc
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 cqa fixes for must gather

Details

In response to this:

/cherrypick enterprise-4.15

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-cherrypick-robot
Copy link
Copy Markdown

@shdeshpa07: #107888 failed to apply on top of branch "enterprise-4.14":

Applying: cqa fixes for must gather
Using index info to reconstruct a base tree...
M	backup_and_restore/application_backup_and_restore/troubleshooting/using-the-must-gather-tool.adoc
M	modules/using-must-gather.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/using-must-gather.adoc
CONFLICT (content): Merge conflict in modules/using-must-gather.adoc
Auto-merging backup_and_restore/application_backup_and_restore/troubleshooting/using-the-must-gather-tool.adoc
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 cqa fixes for must gather

Details

In response to this:

/cherrypick enterprise-4.14

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.

@shdeshpa07
Copy link
Copy Markdown
Contributor Author

other CPs:

4.17: #108286
4.16: #108287
4.15: #108291
4.14: #108292

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants