Skip to content

OSDOCS#11843: Migrated mirroring content for new disconnected experience#81523

Merged
snarayan-redhat merged 1 commit intoopenshift:mainfrom
snarayan-redhat:OSDOCS-11843_migratemirroring
Sep 24, 2024
Merged

OSDOCS#11843: Migrated mirroring content for new disconnected experience#81523
snarayan-redhat merged 1 commit intoopenshift:mainfrom
snarayan-redhat:OSDOCS-11843_migratemirroring

Conversation

@snarayan-redhat
Copy link
Contributor

@snarayan-redhat snarayan-redhat commented Sep 10, 2024

Version(s): 4.17

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

Link to docs preview: https://81523--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/mirroring/

QE review:

  • QE has approved this change.
  • SME has approved this change.

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 10, 2024
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Sep 10, 2024

🤖 Tue Sep 24 07:41:13 - Prow CI generated the docs preview:
https://81523--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 10, 2024
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 15, 2024
@snarayan-redhat snarayan-redhat force-pushed the OSDOCS-11843_migratemirroring branch from f690bf9 to 8b1cdcb Compare September 17, 2024 06:55
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 17, 2024
@openshift-ci openshift-ci bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 17, 2024
@snarayan-redhat snarayan-redhat force-pushed the OSDOCS-11843_migratemirroring branch from 6bb587a to 37a9a61 Compare September 17, 2024 10:47
@snarayan-redhat snarayan-redhat force-pushed the OSDOCS-11843_migratemirroring branch from 46ab292 to e857396 Compare September 18, 2024 09:09
@lmzuccarelli
Copy link

@snarayan-redhat - I think this looks good and actually makes more sense to the user to have grouped info regarding disconnected enviroments. Great work !!!

@snarayan-redhat snarayan-redhat force-pushed the OSDOCS-11843_migratemirroring branch from e857396 to 70c3286 Compare September 19, 2024 07:00
@aguidirh
Copy link

Good job @snarayan-redhat,

For oc adm mirror we have a section: Mirroring images for a disconnected installation
For oc-mirror v1 we have a section: Mirroring images for a disconnected installation using the oc-mirror plugin
For oc-mirror v2 we have a section: Mirroring images for a disconnected installation by using the oc-mirror plugin v2

Is it possible to follow the same standard for the oc adm mirror adding at the end using oc adm release mirror tool?

In the way it is now it seems the section Mirroring images for a disconnected installation is generic and applies to the other two below.

@snarayan-redhat snarayan-redhat force-pushed the OSDOCS-11843_migratemirroring branch from 70c3286 to 9d8a48c Compare September 20, 2024 12:17
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 23, 2024
@kasturinarra
Copy link

Reviewed and provided a comment, waiting for subha to get back on that. Thanks !!

@snarayan-redhat snarayan-redhat force-pushed the OSDOCS-11843_migratemirroring branch from 9d8a48c to 9582e3c Compare September 23, 2024 10:36
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 23, 2024
@snarayan-redhat
Copy link
Contributor Author

Reviewed and provided a comment, waiting for subha to get back on that. Thanks !!

Reviewed and provided a comment, waiting for subha to get back on that. Thanks !!

@kasturinarra I have made the suggested change.

@kasturinarra
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 23, 2024
@lmzuccarelli
Copy link

/lgtm

@snarayan-redhat snarayan-redhat added the peer-review-needed Signifies that the peer review team needs to review this PR label Sep 23, 2024
@adellape adellape added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Sep 23, 2024
@adellape adellape self-assigned this Sep 23, 2024
@adellape adellape added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR peer-review-needed Signifies that the peer review team needs to review this PR labels Sep 23, 2024
@adellape adellape added this to the Planned for 4.17 GA milestone Sep 23, 2024
@snarayan-redhat snarayan-redhat force-pushed the OSDOCS-11843_migratemirroring branch from 9582e3c to 4db89ec Compare September 24, 2024 06:58
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 24, 2024
@openshift-ci
Copy link

openshift-ci bot commented Sep 24, 2024

New changes are detected. LGTM label has been removed.

@snarayan-redhat snarayan-redhat force-pushed the OSDOCS-11843_migratemirroring branch from 4db89ec to 8ee2685 Compare September 24, 2024 07:31
@openshift-ci
Copy link

openshift-ci bot commented Sep 24, 2024

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

@snarayan-redhat snarayan-redhat merged commit 8cf0110 into openshift:main Sep 24, 2024
@snarayan-redhat
Copy link
Contributor Author

/cherrypick enterprise-4.17

@openshift-cherrypick-robot

@snarayan-redhat: #81523 failed to apply on top of branch "enterprise-4.17":

Applying: Migration of mirroring content
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	disconnected/updating/disconnected-update-osus.adoc
M	edge_computing/image_based_upgrade/cnf-understanding-image-based-upgrade.adoc
M	installing/overview/installing-preparing.adoc
M	welcome/index.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/index.adoc
Auto-merging installing/overview/installing-preparing.adoc
Removing installing/disconnected_install/images
Auto-merging edge_computing/image_based_upgrade/cnf-understanding-image-based-upgrade.adoc
Auto-merging disconnected/updating/disconnected-update-osus.adoc
CONFLICT (content): Merge conflict in disconnected/mirroring/snippets
CONFLICT (content): Merge conflict in disconnected/mirroring/modules
CONFLICT (content): Merge conflict in disconnected/mirroring/_attributes
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
Patch failed at 0001 Migration of mirroring content
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".

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.

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

Labels

branch/enterprise-4.17 peer-review-done Signifies that the peer review team has reviewed 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.

10 participants