Skip to content

Conversation

abrennan89
Copy link
Contributor

@abrennan89 abrennan89 commented Aug 29, 2025

Version(s):
4.16+

Issue:
Precursor work for https://issues.redhat.com/browse/CNV-51253

Link to docs preview:
https://98269--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/backup_restore/virt-disaster-recovery.html#virt-disaster-recovery-defining-apps_virt-disaster-recovery

QE review:
N/A

Additional information:
This PR is to complete cleanup including removing [discrete] and h3 (===) headings and separating modules prior to completing the updates for CNV-51253. All content is pre-existing and therefore should not require intensive review before merging.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 29, 2025

@abrennan89: This pull request references CNV-51253 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.20.0" version, but no target version was set.

In response to this:

Version(s):
4.16+

Issue:
Precursor work for https://issues.redhat.com/browse/CNV-51253

Link to docs preview:

QE review:
N/A

Additional information:
This PR is to complete cleanup including removing [discrete] and h3 (===) headings and separating modules prior to completing the updates for CNV-51253. All content is pre-existing and therefore should not require intensive review before merging.

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.

1 similar comment
@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 29, 2025

@abrennan89: This pull request references CNV-51253 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.20.0" version, but no target version was set.

In response to this:

Version(s):
4.16+

Issue:
Precursor work for https://issues.redhat.com/browse/CNV-51253

Link to docs preview:

QE review:
N/A

Additional information:
This PR is to complete cleanup including removing [discrete] and h3 (===) headings and separating modules prior to completing the updates for CNV-51253. All content is pre-existing and therefore should not require intensive review before merging.

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-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 29, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Aug 29, 2025

@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 29, 2025

@abrennan89: This pull request references CNV-51253 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.20.0" version, but no target version was set.

In response to this:

Version(s):
4.16+

Issue:
Precursor work for https://issues.redhat.com/browse/CNV-51253

Link to docs preview:
https://98269--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/backup_restore/virt-disaster-recovery.html#virt-disaster-recovery-defining-apps_virt-disaster-recovery

QE review:
N/A

Additional information:
This PR is to complete cleanup including removing [discrete] and h3 (===) headings and separating modules prior to completing the updates for CNV-51253. All content is pre-existing and therefore should not require intensive review before merging.

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.

@abrennan89 abrennan89 added the merge-review-needed Signifies that the merge review team needs to review this PR label Aug 29, 2025
@dfitzmau dfitzmau added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Sep 1, 2025
@dfitzmau
Copy link
Contributor

dfitzmau commented Sep 1, 2025

Hi @abrennan89 . I added comments. Would you be OK to review them?

Copy link

openshift-ci bot commented Sep 2, 2025

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

@dfitzmau dfitzmau merged commit 9d20b6f into openshift:main Sep 3, 2025
2 checks passed
@dfitzmau
Copy link
Contributor

dfitzmau commented Sep 3, 2025

/cherrypick enterprise-4.20

@dfitzmau
Copy link
Contributor

dfitzmau commented Sep 3, 2025

/cherrypick enterprise-4.19

@dfitzmau
Copy link
Contributor

dfitzmau commented Sep 3, 2025

/cherrypick enterprise-4.18

@dfitzmau
Copy link
Contributor

dfitzmau commented Sep 3, 2025

/cherrypick enterprise-4.17

@dfitzmau
Copy link
Contributor

dfitzmau commented Sep 3, 2025

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@dfitzmau: new pull request created: #98406

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

@dfitzmau: new pull request created: #98407

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

@dfitzmau: new pull request created: #98408

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

@dfitzmau: new pull request created: #98409

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

@dfitzmau: #98269 failed to apply on top of branch "enterprise-4.16":

Applying: CNV-51253: Clean up for DITA migration before updating docs
Using index info to reconstruct a base tree...
M	modules/virt-defining-apps-for-dr.adoc
M	virt/backup_restore/virt-disaster-recovery.adoc
Falling back to patching base and 3-way merge...
Auto-merging virt/backup_restore/virt-disaster-recovery.adoc
CONFLICT (content): Merge conflict in virt/backup_restore/virt-disaster-recovery.adoc
CONFLICT (modify/delete): modules/virt-defining-apps-for-dr.adoc deleted in CNV-51253: Clean up for DITA migration before updating docs and modified in HEAD. Version HEAD of modules/virt-defining-apps-for-dr.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 CNV-51253: Clean up for DITA migration before updating docs

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.

@dfitzmau
Copy link
Contributor

dfitzmau commented Sep 3, 2025

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@dfitzmau: #98269 failed to apply on top of branch "enterprise-4.16":

Applying: CNV-51253: Clean up for DITA migration before updating docs
Using index info to reconstruct a base tree...
M	modules/virt-defining-apps-for-dr.adoc
M	virt/backup_restore/virt-disaster-recovery.adoc
Falling back to patching base and 3-way merge...
Auto-merging virt/backup_restore/virt-disaster-recovery.adoc
CONFLICT (content): Merge conflict in virt/backup_restore/virt-disaster-recovery.adoc
CONFLICT (modify/delete): modules/virt-defining-apps-for-dr.adoc deleted in CNV-51253: Clean up for DITA migration before updating docs and modified in HEAD. Version HEAD of modules/virt-defining-apps-for-dr.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 CNV-51253: Clean up for DITA migration before updating docs

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.

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

Labels

branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. peer-review-in-progress Signifies that the peer review team is reviewing this PR 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