OSDOCS: CNV-40769 - Correcting SCSI type in LUN disk sharing doc (re-redux)

[jherrman]

trafficstars

Version(s): 4.15 and later

Issue: https://issues.redhat.com/browse/CNV-40769

Link to docs preview: https://78487--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/virtual_machines/virtual_disks/virt-configuring-shared-volumes-for-vms.html

QE review: [ ] QE has approved this change.

Additional information: This is another attempt at merging https://github.com/openshift/openshift-docs/pull/76003 and https://github.com/openshift/openshift-docs/pull/78464 , both of which I seem to have messed up during resolution of conflicts with main

[ocpdocs-previewbot]

🤖 Thu Jul 04 13:13:22 - Prow CI generated the docs preview:

https://78487--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/virtual_machines/virtual_disks/virt-configuring-shared-volumes-for-vms.html

[openshift-ci[bot]]

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

[jherrman]

@mburke5678 , this one should be the one :-) Please take a look and let me know if any further changes should be made before this can be merged (in lieu of https://github.com/openshift/openshift-docs/pull/76003 )

[jherrman]

/label merge-review-needed

[kcarmichael08]

/cherrypick enterprise-4.15

[kcarmichael08]

/cherrypick enterprise-4.16

[kcarmichael08]

/cherrypick enterprise-4.17

[openshift-cherrypick-robot]

@kcarmichael08: #78487 failed to apply on top of branch "enterprise-4.15":

Applying: OSDOCS-40769: Corrected SCSI type in LUN disk sharing section
.git/rebase-apply/patch:21: trailing whitespace.
You reserve a LUN through the SCSI persistent reserve options. To enable the reservation: 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	modules/virt-configuring-disk-sharing-lun.adoc
M	virt/virtual_machines/virtual_disks/virt-configuring-shared-volumes-for-vms.adoc
Falling back to patching base and 3-way merge...
Auto-merging virt/virtual_machines/virtual_disks/virt-configuring-shared-volumes-for-vms.adoc
CONFLICT (content): Merge conflict in virt/virtual_machines/virtual_disks/virt-configuring-shared-volumes-for-vms.adoc
Auto-merging modules/virt-configuring-disk-sharing-lun.adoc
CONFLICT (content): Merge conflict in modules/virt-configuring-disk-sharing-lun.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OSDOCS-40769: Corrected SCSI type in LUN disk sharing section
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

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]

@kcarmichael08: new pull request created: #79894

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]

@kcarmichael08: new pull request created: #79895

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.

[kcarmichael08]

Hi @jherrman , unfortunately the cherry pick to 4.15 failed so it looks like it will need a manual CP, sorry!

[jherrman]

Hi @jherrman , unfortunately the cherry pick to 4.15 failed so it looks like it will need a manual CP, sorry!

@kcarmichael08 , I see this PR having been merged successfully, can you confirm that a manual cherry-pick is still required for 4.15?

Edit: Nevermind, I did not realize this MR is for main, not 4.15. I'll get cracking on that cherry-pick.

[jherrman]

Strangely enough, the manual cherry-pick did not report any conflicts: https://github.com/openshift/openshift-docs/pull/80010

Hopefully it's a good sign... :-)

[jherrman]

Welp, turns out that uneventful cherry-pick was because I was cherry-picking a wrong commit from a wrong branch >_<

Apologies for the mess, hopefully https://github.com/openshift/openshift-docs/pull/80081 manages to finish this up once and for all...