Skip to content

add short desc#103793

Merged
shdeshpa07 merged 1 commit intoopenshift:mainfrom
shdeshpa07:OADP-7030-dita-errors-oadp-use-cases
Dec 18, 2025
Merged

add short desc#103793
shdeshpa07 merged 1 commit intoopenshift:mainfrom
shdeshpa07:OADP-7030-dita-errors-oadp-use-cases

Conversation

@shdeshpa07
Copy link
Contributor

@shdeshpa07 shdeshpa07 commented Dec 11, 2025

Jira

Added short desc for an the ROSA use case assembly to fix DITA error.

Version

  • OCP 4.14 → OCP 4.21

Preview

Signed-off-by: Shruti Deshpande <shdeshpa@redhat.com>
@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 11, 2025
@shdeshpa07
Copy link
Contributor Author

/retest

@shdeshpa07 shdeshpa07 added the OADP Label for all OADP PRs label Dec 12, 2025
@openshift-ci
Copy link

openshift-ci bot commented Dec 12, 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

@vashirova - Could you please review the short description added to the assembly? Thanks.

Copy link
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, LGTM.

@shdeshpa07
Copy link
Contributor Author

/cherrypick enterprise-4.21

@shdeshpa07
Copy link
Contributor Author

/cherrypick enterprise-4.20

@shdeshpa07
Copy link
Contributor Author

/cherrypick enterprise-4.19

@shdeshpa07
Copy link
Contributor Author

/cherrypick enterprise-4.18

@shdeshpa07
Copy link
Contributor Author

/cherrypick enterprise-4.17

@openshift-cherrypick-robot

@shdeshpa07: new pull request created: #104114

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

@shdeshpa07: #103793 failed to apply on top of branch "enterprise-4.20":

Patch is empty.
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 record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

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.

@shdeshpa07
Copy link
Contributor Author

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@shdeshpa07: new pull request created: #104115

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.

@shdeshpa07
Copy link
Contributor Author

/cherrypick enterprise-4.15

@shdeshpa07
Copy link
Contributor Author

/cherrypick enterprise-4.14

@openshift-cherrypick-robot

@shdeshpa07: new pull request created: #104116

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

@shdeshpa07: new pull request created: #104117

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

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

Applying: add short desc
Using index info to reconstruct a base tree...
A	backup_and_restore/application_backup_and_restore/oadp-use-cases/oadp-rosa-backup-restore.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): backup_and_restore/application_backup_and_restore/oadp-use-cases/oadp-rosa-backup-restore.adoc deleted in HEAD and modified in add short desc. Version add short desc of backup_and_restore/application_backup_and_restore/oadp-use-cases/oadp-rosa-backup-restore.adoc left in tree.
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 advice.mergeConflict false"
Patch failed at 0001 add short desc

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

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

Applying: add short desc
Using index info to reconstruct a base tree...
A	backup_and_restore/application_backup_and_restore/oadp-use-cases/oadp-rosa-backup-restore.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): backup_and_restore/application_backup_and_restore/oadp-use-cases/oadp-rosa-backup-restore.adoc deleted in HEAD and modified in add short desc. Version add short desc of backup_and_restore/application_backup_and_restore/oadp-use-cases/oadp-rosa-backup-restore.adoc left in tree.
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 advice.mergeConflict false"
Patch failed at 0001 add short desc

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

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

Applying: add short desc
Using index info to reconstruct a base tree...
A	backup_and_restore/application_backup_and_restore/oadp-use-cases/oadp-rosa-backup-restore.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): backup_and_restore/application_backup_and_restore/oadp-use-cases/oadp-rosa-backup-restore.adoc deleted in HEAD and modified in add short desc. Version add short desc of backup_and_restore/application_backup_and_restore/oadp-use-cases/oadp-rosa-backup-restore.adoc left in tree.
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 advice.mergeConflict false"
Patch failed at 0001 add short desc

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
Contributor Author

/cherrypick enterprise-4.20

@openshift-cherrypick-robot

@shdeshpa07: new pull request created: #104119

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.

@shdeshpa07
Copy link
Contributor Author

The automated CPs for 4.16, 4.15, and 4.14 have failed because the ROSA use case has not been included in those branches. Hence we don't need to take any action on the failed CPs.

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.

3 participants