OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc by dfitzmau · Pull Request #105116 · openshift/openshift-docs

dfitzmau · 2026-01-21T10:22:03Z

PR prepares the installation-bare-metal-config-yaml.adoc file for DITA migration. File is used in multiple assemblies but key assembly is installing-bare-metal.adoc

Continue next PR from modules/registry-removed.adoc

Version(s):
4.16+

Issue:
OSDOCS-17013

Link to docs preview:

openshift-ci-robot · 2026-01-21T10:22:07Z

@dfitzmau: No Jira issue with key upi-6 exists in the tracker at https://issues.redhat.com/.
Once a valid jira issue is referenced in the title of this pull request, request a refresh with /jira refresh.

Details

In response to this:

PR prepares the installation-bare-metal-config-yaml.adoc file for DITA migration. File is used in multiple assemblies but key assembly is installing-bare-metal.adoc

Version(s):
4.16+

Issue:
OSDOCS-17013

Link to docs preview:

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.

ocpdocs-previewbot · 2026-01-21T10:30:56Z

🤖 Thu Jan 22 10:46:17 - Prow CI generated the docs preview:
https://105116--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

modules/installation-user-infra-machines-pxe.adoc

modules/installation-user-infra-machines-advanced-console-configuration.adoc

openshift-ci-robot · 2026-01-21T11:31:48Z

@dfitzmau: No Jira issue with key upi-6 exists in the tracker at https://issues.redhat.com/.
Once a valid jira issue is referenced in the title of this pull request, request a refresh with /jira refresh.

Details

In response to this:

PR prepares the installation-bare-metal-config-yaml.adoc file for DITA migration. File is used in multiple assemblies but key assembly is installing-bare-metal.adoc

Continue next PR from modules/installation-user-infra-machines-static-network.adoc

Version(s):
4.16+

Issue:
OSDOCS-17013

Link to docs preview:

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.

modules/installation-user-infra-machines-advanced-console-configuration.adoc

openshift-ci-robot · 2026-01-21T11:41:37Z

@dfitzmau: No Jira issue with key upi-6 exists in the tracker at https://issues.redhat.com/.
Once a valid jira issue is referenced in the title of this pull request, request a refresh with /jira refresh.

Details

In response to this:

PR prepares the installation-bare-metal-config-yaml.adoc file for DITA migration. File is used in multiple assemblies but key assembly is installing-bare-metal.adoc

Continue next PR from modules/installation-user-infra-machines-static-network.adoc

Version(s):
4.16+

Issue:
OSDOCS-17013

Link to docs preview:

https://105116--ocpdocs-pr.netlify.app/openshift-enterprise/latest/installing/installing_bare_metal/upi/installing-bare-metal.html

https://105116--ocpdocs-pr.netlify.app/openshift-enterprise/latest/installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.html

https://105116--ocpdocs-pr.netlify.app/openshift-enterprise/latest/installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.html

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-robot · 2026-01-21T14:24:06Z

@dfitzmau: No Jira issue with key upi-6 exists in the tracker at https://issues.redhat.com/.
Once a valid jira issue is referenced in the title of this pull request, request a refresh with /jira refresh.

Details

In response to this:

PR prepares the installation-bare-metal-config-yaml.adoc file for DITA migration. File is used in multiple assemblies but key assembly is installing-bare-metal.adoc

Continue next PR from modules/registry-removed.adoc

Version(s):
4.16+

Issue:
OSDOCS-17013

Link to docs preview:

https://105116--ocpdocs-pr.netlify.app/openshift-enterprise/latest/installing/installing_bare_metal/upi/installing-bare-metal.html

https://105116--ocpdocs-pr.netlify.app/openshift-enterprise/latest/installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.html

https://105116--ocpdocs-pr.netlify.app/openshift-enterprise/latest/installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.html

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.

stevsmit

Overall looks good. One comment to consider, and one thing to fix (the + sign).

modules/installation-user-infra-generate-k8s-manifest-ignition.adoc

modules/installation-user-infra-machines-advanced-customizing-live-iscsi-ibft.adoc

modules/installation-user-infra-machines-advanced-customizing-live-iscsi-manual.adoc

modules/installation-user-infra-machines-advanced-disk.adoc

openshift-ci · 2026-01-22T10:48:13Z

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

dfitzmau · 2026-01-22T11:02:21Z

/cherrypick enterprise-4.21

dfitzmau · 2026-01-22T11:02:25Z

/cherrypick enterprise-4.20

dfitzmau · 2026-01-22T11:02:28Z

/cherrypick enterprise-4.19

dfitzmau · 2026-01-22T11:02:32Z

/cherrypick enterprise-4.18

dfitzmau · 2026-01-22T11:02:36Z

/cherrypick enterprise-4.17

dfitzmau · 2026-01-22T11:02:40Z

/cherrypick enterprise-4.16

openshift-cherrypick-robot · 2026-01-22T11:03:09Z

@dfitzmau: #105116 failed to apply on top of branch "enterprise-4.21":

Applying: OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc
.git/rebase-apply/patch:369: trailing whitespace.
where: 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	modules/installation-configure-proxy.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-configure-proxy.adoc
CONFLICT (content): Merge conflict in modules/installation-configure-proxy.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 OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc

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 · 2026-01-22T11:03:14Z

@dfitzmau: #105116 failed to apply on top of branch "enterprise-4.20":

Applying: OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc
.git/rebase-apply/patch:369: trailing whitespace.
where: 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	modules/installation-configure-proxy.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-configure-proxy.adoc
CONFLICT (content): Merge conflict in modules/installation-configure-proxy.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 OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc

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 · 2026-01-22T11:03:18Z

@dfitzmau: #105116 failed to apply on top of branch "enterprise-4.19":

Applying: OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc
.git/rebase-apply/patch:369: trailing whitespace.
where: 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	modules/installation-configure-proxy.adoc
M	modules/installation-user-infra-generate-k8s-manifest-ignition.adoc
M	modules/installation-user-infra-machines-iso.adoc
M	modules/installation-user-infra-machines-pxe.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-user-infra-machines-pxe.adoc
Auto-merging modules/installation-user-infra-machines-iso.adoc
Auto-merging modules/installation-user-infra-generate-k8s-manifest-ignition.adoc
Auto-merging modules/installation-configure-proxy.adoc
CONFLICT (content): Merge conflict in modules/installation-configure-proxy.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 OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc

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 · 2026-01-22T11:03:23Z

@dfitzmau: #105116 failed to apply on top of branch "enterprise-4.18":

Applying: OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc
.git/rebase-apply/patch:369: trailing whitespace.
where: 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc
M	installing/installing_bare_metal/upi/installing-bare-metal.adoc
M	installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc
M	installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc
M	installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc
M	installing/installing_ibm_z/upi/installing-ibm-z.adoc
M	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc
M	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc
M	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc
M	modules/installation-configure-proxy.adoc
M	modules/installation-user-infra-generate-k8s-manifest-ignition.adoc
M	modules/installation-user-infra-machines-advanced-enabling-serial-console.adoc
M	modules/installation-user-infra-machines-iso.adoc
M	modules/installation-user-infra-machines-pxe.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-user-infra-machines-pxe.adoc
Auto-merging modules/installation-user-infra-machines-iso.adoc
CONFLICT (content): Merge conflict in modules/installation-user-infra-machines-iso.adoc
Auto-merging modules/installation-user-infra-machines-advanced-enabling-serial-console.adoc
Auto-merging modules/installation-user-infra-generate-k8s-manifest-ignition.adoc
Auto-merging modules/installation-configure-proxy.adoc
CONFLICT (content): Merge conflict in modules/installation-configure-proxy.adoc
Auto-merging installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc
Auto-merging installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc
Auto-merging installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc
Auto-merging installing/installing_ibm_z/upi/installing-ibm-z.adoc
Auto-merging installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc
Auto-merging installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc
Auto-merging installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc
Auto-merging installing/installing_bare_metal/upi/installing-bare-metal.adoc
Auto-merging installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.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 OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc

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 · 2026-01-22T11:03:28Z

@dfitzmau: #105116 failed to apply on top of branch "enterprise-4.17":

Applying: OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc
Using index info to reconstruct a base tree...
A	installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal.adoc
A	installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc
M	installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
M	installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc
M	installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc
M	installing/installing_ibm_z/upi/installing-ibm-z.adoc
M	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc
M	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc
M	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc
M	modules/creating-machines-bare-metal.adoc
M	modules/installation-configure-proxy.adoc
M	modules/installation-three-node-cluster.adoc
M	modules/installation-user-infra-generate-k8s-manifest-ignition.adoc
M	modules/installation-user-infra-machines-advanced-console-configuration.adoc.git/rebase-apply/patch:369: trailing whitespace.
where: 
warning: 1 line adds whitespace errors.

M	modules/installation-user-infra-machines-advanced-customizing-iso-or-pxe.adoc
M	modules/installation-user-infra-machines-advanced-customizing-live-ca-certs.adoc
M	modules/installation-user-infra-machines-advanced-customizing-live-iscsi-ibft.adoc
M	modules/installation-user-infra-machines-advanced-customizing-live-iscsi-manual.adoc
M	modules/installation-user-infra-machines-advanced-customizing-live-network-config.adoc
M	modules/installation-user-infra-machines-advanced-customizing-live-serial-console.adoc
M	modules/installation-user-infra-machines-advanced-customizing-live.adoc
M	modules/installation-user-infra-machines-advanced-enabling-serial-console.adoc
M	modules/installation-user-infra-machines-advanced.adoc
M	modules/installation-user-infra-machines-iso.adoc
M	modules/installation-user-infra-machines-pxe.adoc
M	modules/installation-user-infra-machines-static-network.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-user-infra-machines-static-network.adoc
Auto-merging modules/installation-user-infra-machines-pxe.adoc
Auto-merging modules/installation-user-infra-machines-iso.adoc
CONFLICT (content): Merge conflict in modules/installation-user-infra-machines-iso.adoc
Auto-merging modules/installation-user-infra-machines-advanced.adoc
Auto-merging modules/installation-user-infra-machines-advanced-enabling-serial-console.adoc
CONFLICT (content): Merge conflict in modules/installation-user-infra-machines-advanced-enabling-serial-console.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-live.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-live-serial-console.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-live-network-config.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-live-iscsi-manual.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-live-iscsi-ibft.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-live-ca-certs.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-iso-or-pxe.adoc
Auto-merging modules/installation-user-infra-machines-advanced-console-configuration.adoc
Auto-merging modules/installation-user-infra-generate-k8s-manifest-ignition.adoc
Auto-merging modules/installation-three-node-cluster.adoc
Auto-merging modules/installation-configure-proxy.adoc
CONFLICT (content): Merge conflict in modules/installation-configure-proxy.adoc
Auto-merging modules/creating-machines-bare-metal.adoc
Auto-merging installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc
Auto-merging installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc
Auto-merging installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc
Auto-merging installing/installing_ibm_z/upi/installing-ibm-z.adoc
Auto-merging installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc
Auto-merging installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc
Auto-merging installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc deleted in HEAD and modified in OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc. Version OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc of installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc left in tree.
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-bare-metal.adoc deleted in HEAD and modified in OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc. Version OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc of installing/installing_bare_metal/upi/installing-bare-metal.adoc left in tree.
Auto-merging installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc
CONFLICT (content): Merge conflict in installing/installing_bare_metal/installing-bare-metal-network-customizations.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 OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc

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 · 2026-01-22T11:03:34Z

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

Applying: OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc
Using index info to reconstruct a base tree...
A	installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal.adoc
A	installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc
M	installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
A	installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc
A	installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc
A	installing/installing_ibm_z/upi/installing-ibm-z.adoc
A	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc
A	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc
A	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc
M	modules/creating-machines-bare-metal.adoc
M	modules/installation-configure-proxy.adoc
M	modules/installation-three-node-cluster.adoc
M	modules/installation-user-infra-generate-k8s-manifest-ignition.adoc
M	modules/installation-user-infra-machines-advanced-console-configuration.adoc.git/rebase-apply/patch:369: trailing whitespace.
where: 
warning: 1 line adds whitespace errors.

M	modules/installation-user-infra-machines-advanced-customizing-iso-or-pxe.adoc
M	modules/installation-user-infra-machines-advanced-customizing-live-ca-certs.adoc
M	modules/installation-user-infra-machines-advanced-customizing-live-iscsi-ibft.adoc
M	modules/installation-user-infra-machines-advanced-customizing-live-iscsi-manual.adoc
M	modules/installation-user-infra-machines-advanced-customizing-live-network-config.adoc
M	modules/installation-user-infra-machines-advanced-customizing-live-serial-console.adoc
M	modules/installation-user-infra-machines-advanced-customizing-live.adoc
M	modules/installation-user-infra-machines-advanced-enabling-serial-console.adoc
M	modules/installation-user-infra-machines-advanced.adoc
M	modules/installation-user-infra-machines-iso.adoc
M	modules/installation-user-infra-machines-pxe.adoc
M	modules/installation-user-infra-machines-static-network.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-user-infra-machines-static-network.adoc
Auto-merging modules/installation-user-infra-machines-pxe.adoc
Auto-merging modules/installation-user-infra-machines-iso.adoc
CONFLICT (content): Merge conflict in modules/installation-user-infra-machines-iso.adoc
Auto-merging modules/installation-user-infra-machines-advanced.adoc
Auto-merging modules/installation-user-infra-machines-advanced-enabling-serial-console.adoc
CONFLICT (content): Merge conflict in modules/installation-user-infra-machines-advanced-enabling-serial-console.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-live.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-live-serial-console.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-live-network-config.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-live-iscsi-manual.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-live-iscsi-ibft.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-live-ca-certs.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-iso-or-pxe.adoc
Auto-merging modules/installation-user-infra-machines-advanced-console-configuration.adoc
Auto-merging modules/installation-user-infra-generate-k8s-manifest-ignition.adoc
Auto-merging modules/installation-three-node-cluster.adoc
Auto-merging modules/installation-configure-proxy.adoc
CONFLICT (content): Merge conflict in modules/installation-configure-proxy.adoc
Auto-merging modules/creating-machines-bare-metal.adoc
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc deleted in HEAD and modified in OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc. Version OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc of installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc deleted in HEAD and modified in OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc. Version OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc of installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc deleted in HEAD and modified in OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc. Version OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc of installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-ibm-z.adoc deleted in HEAD and modified in OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc. Version OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc of installing/installing_ibm_z/upi/installing-ibm-z.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc deleted in HEAD and modified in OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc. Version OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc of installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc deleted in HEAD and modified in OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc. Version OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc of installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc left in tree.
Auto-merging installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc deleted in HEAD and modified in OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc. Version OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc of installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc left in tree.
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-bare-metal.adoc deleted in HEAD and modified in OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc. Version OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc of installing/installing_bare_metal/upi/installing-bare-metal.adoc left in tree.
Auto-merging installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc
CONFLICT (content): Merge conflict in installing/installing_bare_metal/installing-bare-metal-network-customizations.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 OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc

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.

dfitzmau added branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 branch/enterprise-4.21 labels Jan 21, 2026

openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 21, 2026

dfitzmau force-pushed the OSDOCS-17013-bm-upi-6 branch 2 times, most recently from bc49cf0 to 01abb4b Compare January 21, 2026 10:46

ocpdocs-vale-bot reviewed Jan 21, 2026

View reviewed changes

modules/installation-user-infra-machines-pxe.adoc Outdated Show resolved Hide resolved

ocpdocs-vale-bot reviewed Jan 21, 2026

View reviewed changes

modules/installation-user-infra-machines-pxe.adoc Outdated Show resolved Hide resolved

dfitzmau force-pushed the OSDOCS-17013-bm-upi-6 branch from 01abb4b to 1223a23 Compare January 21, 2026 10:58

ocpdocs-vale-bot reviewed Jan 21, 2026

View reviewed changes

modules/installation-user-infra-machines-advanced-console-configuration.adoc Outdated Show resolved Hide resolved

ocpdocs-vale-bot reviewed Jan 21, 2026

View reviewed changes

modules/installation-user-infra-machines-advanced-console-configuration.adoc Outdated Show resolved Hide resolved

dfitzmau force-pushed the OSDOCS-17013-bm-upi-6 branch 3 times, most recently from 846c56b to 3799590 Compare January 21, 2026 11:30

ocpdocs-vale-bot reviewed Jan 21, 2026

View reviewed changes

modules/installation-user-infra-machines-advanced-console-configuration.adoc Show resolved Hide resolved

dfitzmau added the merge-review-needed Signifies that the merge review team needs to review this PR label Jan 21, 2026

stevsmit added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Jan 21, 2026

stevsmit added this to the Continuous Release milestone Jan 21, 2026

stevsmit reviewed Jan 21, 2026

View reviewed changes

stevsmit added peer-review-done Signifies that the peer review team has reviewed this PR and removed merge-review-in-progress Signifies that the merge review team is reviewing this PR labels Jan 21, 2026

dfitzmau force-pushed the OSDOCS-17013-bm-upi-6 branch 2 times, most recently from c4d2098 to d9fcc25 Compare January 22, 2026 10:34

OSDOCS-17013-bm-upi-6: CQA for the BM UPI doc

ceafd21

dfitzmau force-pushed the OSDOCS-17013-bm-upi-6 branch from d9fcc25 to ceafd21 Compare January 22, 2026 10:38

dfitzmau merged commit 352432d into openshift:main Jan 22, 2026
2 checks passed

dfitzmau mentioned this pull request Apr 2, 2026

OSDOCS-17013-remediation-3 #109524

Open

Conversation

dfitzmau commented Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Jan 21, 2026

Uh oh!

ocpdocs-previewbot commented Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

openshift-ci-robot commented Jan 21, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Jan 21, 2026

Uh oh!

openshift-ci-robot commented Jan 21, 2026

Uh oh!

stevsmit left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

openshift-ci bot commented Jan 22, 2026

Uh oh!

Uh oh!

dfitzmau commented Jan 22, 2026

Uh oh!

dfitzmau commented Jan 22, 2026

Uh oh!

dfitzmau commented Jan 22, 2026

Uh oh!

dfitzmau commented Jan 22, 2026

Uh oh!

dfitzmau commented Jan 22, 2026

Uh oh!

dfitzmau commented Jan 22, 2026

Uh oh!

openshift-cherrypick-robot commented Jan 22, 2026

Uh oh!

openshift-cherrypick-robot commented Jan 22, 2026

Uh oh!

openshift-cherrypick-robot commented Jan 22, 2026

Uh oh!

openshift-cherrypick-robot commented Jan 22, 2026

Uh oh!

openshift-cherrypick-robot commented Jan 22, 2026

Uh oh!

openshift-cherrypick-robot commented Jan 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

dfitzmau commented Jan 21, 2026 •

edited

Loading

ocpdocs-previewbot commented Jan 21, 2026 •

edited

Loading