OSDOCS#16276: Flattened oc-mirror levels #100088

snarayan-redhat · 2025-10-07T06:55:44Z

Version(s): 4.18

Issue: https://issues.redhat.com/browse/OSDOCS-16276

QE review:

QE has approved this change.

Additional information:

ocpdocs-previewbot · 2025-10-07T07:01:42Z

🤖 Tue Oct 14 13:06:33 - Prow CI generated the docs preview:
https://100088--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

disconnected/installing-mirroring-disconnected.adoc

xenolinux · 2025-10-14T12:02:07Z

/test validate-portal

snarayan-redhat · 2025-10-14T12:15:43Z

/retest

openshift-ci · 2025-10-14T13:08:16Z

@snarayan-redhat: 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.

aguidirh

/lgtm

mburke5678 · 2025-10-15T17:09:31Z

/cherrypick enterprise-4.18
/cherrypick enterprise-4.19
/cherrypick enterprise-4.20

openshift-cherrypick-robot · 2025-10-15T17:10:18Z

@mburke5678: #100088 failed to apply on top of branch "enterprise-4.18":

Applying: updated path
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	cicd/pipelines/creating-applications-with-cicd-pipelines.adoc
M	cicd/pipelines/installing-pipelines.adoc
M	disconnected/mirroring/about-installing-oc-mirror-v2.adoc
M	disconnected/mirroring/installing-mirroring-installation-images.adoc
M	disconnected/using-olm.adoc
M	hosted_control_planes/hcp-disconnected/hcp-deploy-dc-bm.adoc
M	hosted_control_planes/hcp-disconnected/hcp-deploy-dc-virt.adoc
M	installing/installing_bare_metal/ipi/ipi-install-installation-workflow.adoc
M	installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc
M	installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.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	installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc
M	installing/overview/installing-preparing.adoc
M	operators/admin/olm-managing-custom-catalogs.adoc
M	operators/understanding/olm-packaging-format.adoc
M	post_installation_configuration/preparing-for-users.adoc
M	rosa_architecture/index.adoc
M	welcome/learn_more_about_openshift.adoc
M	windows_containers/enabling-windows-container-workloads.adoc
Falling back to patching base and 3-way merge...
Auto-merging windows_containers/enabling-windows-container-workloads.adoc
Auto-merging welcome/learn_more_about_openshift.adoc
Auto-merging rosa_architecture/index.adoc
Auto-merging post_installation_configuration/preparing-for-users.adoc
Auto-merging operators/understanding/olm-packaging-format.adoc
Auto-merging operators/admin/olm-managing-custom-catalogs.adoc
Auto-merging installing/overview/installing-preparing.adoc
Auto-merging installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.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_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
Auto-merging installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc
Auto-merging installing/installing_bare_metal/ipi/ipi-install-installation-workflow.adoc
Auto-merging hosted_control_planes/hcp-disconnected/hcp-deploy-dc-virt.adoc
Auto-merging hosted_control_planes/hcp-disconnected/hcp-deploy-dc-bm.adoc
Auto-merging disconnected/using-olm.adoc
Removing disconnected/mirroring/snippets
Removing disconnected/mirroring/modules
Removing disconnected/mirroring/images
Removing disconnected/mirroring/_attributes
Auto-merging disconnected/installing-mirroring-installation-images.adoc
CONFLICT (content): Merge conflict in disconnected/installing-mirroring-installation-images.adoc
Auto-merging disconnected/about-installing-oc-mirror-v2.adoc
Auto-merging cicd/pipelines/installing-pipelines.adoc
Auto-merging cicd/pipelines/creating-applications-with-cicd-pipelines.adoc
Auto-merging _topic_maps/_topic_map.yml
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 updated path

In response to this:

/cherrypick enterprise-4.18
/cherrypick enterprise-4.19
/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.

mburke5678 · 2025-10-15T17:13:36Z

/cherrypick enterprise-4.19

mburke5678 · 2025-10-15T17:13:42Z

/cherrypick enterprise-4.20

openshift-cherrypick-robot · 2025-10-15T17:14:24Z

@mburke5678: #100088 failed to apply on top of branch "enterprise-4.19":

Applying: updated path
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	cicd/pipelines/creating-applications-with-cicd-pipelines.adoc
M	cicd/pipelines/installing-pipelines.adoc
M	disconnected/mirroring/installing-mirroring-installation-images.adoc
M	disconnected/using-olm.adoc
M	installing/overview/installing-preparing.adoc
M	post_installation_configuration/preparing-for-users.adoc
M	rosa_architecture/index.adoc
M	welcome/learn_more_about_openshift.adoc
M	windows_containers/enabling-windows-container-workloads.adoc
Falling back to patching base and 3-way merge...
Auto-merging windows_containers/enabling-windows-container-workloads.adoc
Auto-merging welcome/learn_more_about_openshift.adoc
Auto-merging rosa_architecture/index.adoc
Auto-merging post_installation_configuration/preparing-for-users.adoc
Auto-merging installing/overview/installing-preparing.adoc
Auto-merging disconnected/using-olm.adoc
Removing disconnected/mirroring/snippets
Removing disconnected/mirroring/modules
Removing disconnected/mirroring/images
Removing disconnected/mirroring/_attributes
Auto-merging disconnected/installing-mirroring-installation-images.adoc
CONFLICT (content): Merge conflict in disconnected/installing-mirroring-installation-images.adoc
Auto-merging cicd/pipelines/installing-pipelines.adoc
Auto-merging cicd/pipelines/creating-applications-with-cicd-pipelines.adoc
Auto-merging _topic_maps/_topic_map.yml
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 updated path

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 · 2025-10-15T17:14:33Z

@mburke5678: new pull request created: #100550

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-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 7, 2025

ocpdocs-vale-bot reviewed Oct 7, 2025

View reviewed changes

disconnected/installing-mirroring-disconnected.adoc Show resolved Hide resolved

snarayan-redhat force-pushed the OSDOCS-16276_flattenocmirror branch from ae70181 to ff615a2 Compare October 7, 2025 07:08

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 11, 2025

snarayan-redhat force-pushed the OSDOCS-16276_flattenocmirror branch from ff615a2 to 45cf286 Compare October 14, 2025 06:21

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 14, 2025

snarayan-redhat force-pushed the OSDOCS-16276_flattenocmirror branch from 45cf286 to e8644ae Compare October 14, 2025 06:48

updated path

e8578d8

snarayan-redhat force-pushed the OSDOCS-16276_flattenocmirror branch from e8644ae to e8578d8 Compare October 14, 2025 12:48

aguidirh approved these changes Oct 15, 2025

View reviewed changes

openshift-ci bot assigned aguidirh Oct 15, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 15, 2025

snarayan-redhat added the merge-review-needed Signifies that the merge review team needs to review this PR label Oct 15, 2025

mburke5678 added this to the Continuous Release milestone Oct 15, 2025

mburke5678 merged commit 71e1f67 into openshift:main Oct 15, 2025
2 checks passed

openshift-cherrypick-robot mentioned this pull request Oct 15, 2025

[enterprise-4.20] OSDOCS#16276: Flattened oc-mirror levels #100550

Merged

This was referenced Oct 15, 2025

[enterprise-4.18] OSDOCS#16276: Flattened oc-mirror levels #100552

Merged

[enterprise-4.19] OSDOCS#16276: Flattened oc-mirror levels #100553

Merged

[enterprise-4.20] OSDOCS#16276: Flattened oc-mirror levels #100556

Merged

OSDOCS#16276: Flattened oc-mirror levels #100088

OSDOCS#16276: Flattened oc-mirror levels #100088

Uh oh!

Conversation

snarayan-redhat commented Oct 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ocpdocs-previewbot commented Oct 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

xenolinux commented Oct 14, 2025

Uh oh!

snarayan-redhat commented Oct 14, 2025

Uh oh!

openshift-ci bot commented Oct 14, 2025

Uh oh!

aguidirh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mburke5678 commented Oct 15, 2025

Uh oh!

openshift-cherrypick-robot commented Oct 15, 2025

Uh oh!

mburke5678 commented Oct 15, 2025

Uh oh!

mburke5678 commented Oct 15, 2025

Uh oh!

openshift-cherrypick-robot commented Oct 15, 2025

Uh oh!

openshift-cherrypick-robot commented Oct 15, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

snarayan-redhat commented Oct 7, 2025 •

edited

Loading

ocpdocs-previewbot commented Oct 7, 2025 •

edited

Loading