Skip to content

Conversation

@shdeshpa07
Copy link
Contributor

cherrypicked from 0678db8 xref: #98223

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 13, 2025
@shdeshpa07 shdeshpa07 added OADP Label for all OADP PRs branch/enterprise-4.18 labels Oct 13, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Oct 13, 2025

🤖 Wed Oct 15 07:46:49 - Prow CI generated the docs preview:
https://100389--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@shdeshpa07
Copy link
Contributor Author

Hi @anarnold97 - I tried to cherry pick the DITA validation work for troubleshooting from 4.19 over to 4.18 but, no guesses there, ran into a plethora of merge conflicts. Could you please give this PR a quick review for the sake of my sanity? Thanks!

Copy link
Contributor

@anarnold97 anarnold97 left a comment

Choose a reason for hiding this comment

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

LGTM apart from the line in the common-attributes file

Signed-off-by: Shruti Deshpande <shdeshpa@redhat.com>
@shdeshpa07 shdeshpa07 force-pushed the 4.18-backport-dita-oadp-troubleshooting branch from 93bb596 to 6e71944 Compare October 15, 2025 04:23
@shdeshpa07 shdeshpa07 added this to the Continuous Release milestone Oct 15, 2025
@shdeshpa07 shdeshpa07 closed this Oct 15, 2025
@shdeshpa07 shdeshpa07 reopened this Oct 15, 2025
@shdeshpa07
Copy link
Contributor Author

/retest

@shdeshpa07 shdeshpa07 closed this Oct 15, 2025
@shdeshpa07 shdeshpa07 reopened this Oct 15, 2025
@shdeshpa07
Copy link
Contributor Author

/retest

1 similar comment
@xenolinux
Copy link
Contributor

/retest

@xenolinux
Copy link
Contributor

/test validate-asciidoc

@openshift-ci
Copy link

openshift-ci bot commented Oct 15, 2025

@shdeshpa07: all tests passed!

Full PR test history. Your PR dashboard.

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 shdeshpa07 merged commit 12868cb into openshift:enterprise-4.18 Oct 15, 2025
2 checks passed
@shdeshpa07
Copy link
Contributor Author

/cherrypick enterprise-4.17

@openshift-cherrypick-robot

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

Applying: 4.18-backport-oadp-troubleshooting
.git/rebase-apply/patch:333: trailing whitespace.
:toc: 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	backup_and_restore/application_backup_and_restore/installing/about-installing-oadp.adoc
Falling back to patching base and 3-way merge...
Auto-merging backup_and_restore/application_backup_and_restore/installing/about-installing-oadp.adoc
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.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 advice.mergeConflict false"
Patch failed at 0001 4.18-backport-oadp-troubleshooting

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.

@shdeshpa07
Copy link
Contributor Author

/cherrypick enterprise-4.17

@openshift-cherrypick-robot

@shdeshpa07: new pull request created: #101140

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.

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

Labels

branch/enterprise-4.18 OADP Label for all OADP PRs size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants