Skip to content

Conversation

@skopacz1
Copy link
Contributor

@skopacz1 skopacz1 commented Apr 3, 2024

Version(s): 4.13+

This PR removes duplicate oc mirror content in the updating clusters docs and instead links users to the original location of the docs in the installing section.

QE review:

  • QE has approved this change.

Preview: Mirroring OpenShift Container Platform images

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

ocpdocs-previewbot commented Apr 3, 2024

@shellyyang1989
Copy link

@jiajliu @JianLi-RH PTAL when time permits. Thank you!

@petr-muller
Copy link
Member

/cc

@openshift-ci openshift-ci bot requested a review from petr-muller May 13, 2024 08:21
Copy link
Member

@petr-muller petr-muller left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Crosslinks instead of duplication FTW

@jiajliu
Copy link

jiajliu commented May 14, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 14, 2024
@skopacz1 skopacz1 added the peer-review-needed Signifies that the peer review team needs to review this PR label May 14, 2024
@bscott-rh bscott-rh added peer-review-in-progress Signifies that the peer review team is reviewing this PR branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 and removed peer-review-needed Signifies that the peer review team needs to review this PR labels May 14, 2024
@bscott-rh bscott-rh added this to the Continuous Release milestone May 14, 2024
@bscott-rh
Copy link
Contributor

Left one comment, otherwise LGTM.

/remove-label peer-review-in-progress
/remove-label peer-review-needed
/label peer-review-done

@bscott-rh bscott-rh 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 labels May 14, 2024
@openshift-ci
Copy link

openshift-ci bot commented May 14, 2024

@bscott-rh: Those labels are not set on the issue: peer-review-in-progress, peer-review-needed

In response to this:

Left one comment, otherwise LGTM.

/remove-label peer-review-in-progress
/remove-label peer-review-needed
/label peer-review-done

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.

@skopacz1 skopacz1 force-pushed the ocmirror_OTA_cleanup branch from c5134b3 to 020e9cf Compare May 14, 2024 16:31
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 14, 2024
@openshift-ci
Copy link

openshift-ci bot commented May 14, 2024

New changes are detected. LGTM label has been removed.

@openshift-ci
Copy link

openshift-ci bot commented May 14, 2024

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

@skopacz1 skopacz1 merged commit 86e3946 into openshift:main May 14, 2024
@skopacz1
Copy link
Contributor Author

/cherrypick enterprise-4.13

@skopacz1
Copy link
Contributor Author

/cherrypick enterprise-4.14

@skopacz1
Copy link
Contributor Author

/cherrypick enterprise-4.15

@skopacz1
Copy link
Contributor Author

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@skopacz1: #74178 failed to apply on top of branch "enterprise-4.13":

Applying: OTA oc mirror docs changes
Using index info to reconstruct a base tree...
M	modules/update-mirror-repository.adoc
A	updating/updating_a_cluster/updating_disconnected_cluster/mirroring-image-repository.adoc
Falling back to patching base and 3-way merge...
Auto-merging updating/updating-restricted-network-cluster/mirroring-image-repository.adoc
CONFLICT (content): Merge conflict in updating/updating-restricted-network-cluster/mirroring-image-repository.adoc
Auto-merging modules/update-mirror-repository.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 OTA oc mirror docs changes
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.13

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

@skopacz1: new pull request created: #75932

In response to this:

/cherrypick enterprise-4.14

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

@skopacz1: new pull request created: #75933

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

@skopacz1: new pull request created: #75934

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.

@skopacz1 skopacz1 deleted the ocmirror_OTA_cleanup branch March 11, 2025 17:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 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.

7 participants