Skip to content

Conversation

ShaunaDiaz
Copy link
Contributor

@ShaunaDiaz ShaunaDiaz commented Aug 4, 2025

Version(s):
4.18+

Issue:
OSDOCS-13626

Link to docs preview:
https://97064--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror.html
https://97064--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror-disconnected#oc-mirror-dry-run_microshift-operators-oc-mirror-disconnected

QE review:

  • QE has approved this change.

Additional info: QE is still testing, so please review and place an ok-to-merge label if all is well. I'll merge it when QE is done testing in case there are small changes.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 4, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 4, 2025

@ShaunaDiaz: This pull request references OSDOCS-13626 which is a valid jira issue.

In response to this:

Version(s):
4.18+

Issue:
OSDOCS-13626

Link to docs preview:

QE review:

  • QE has approved this change.

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.

@ShaunaDiaz ShaunaDiaz changed the title OSDOCS-13626: updates oc mirror to v2 [WIP] OSDOCS-13626: updates oc mirror to v2 Aug 4, 2025
@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 4, 2025
@ShaunaDiaz ShaunaDiaz force-pushed the OSDOCS-13626 branch 2 times, most recently from 91431bf to 693a888 Compare August 4, 2025 18:56
@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 11, 2025

@ShaunaDiaz: This pull request references OSDOCS-13626 which is a valid jira issue.

In response to this:

Version(s):
4.18+

Issue:
OSDOCS-13626

Link to docs preview:
microshift-operators-oc-mirror.html

QE review:

  • QE has approved this change.

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 openshift-ci bot added 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. labels Aug 11, 2025
@ShaunaDiaz ShaunaDiaz changed the title [WIP] OSDOCS-13626: updates oc mirror to v2 OSDOCS-13626: updates oc mirror to v2 Aug 11, 2025
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 11, 2025
@ShaunaDiaz ShaunaDiaz changed the title OSDOCS-13626: updates oc mirror to v2 OSDOCS-13626: updates oc mirror to v2 MicroShift Aug 11, 2025
@ShaunaDiaz ShaunaDiaz added this to the Planned for 4.20 GA milestone Aug 11, 2025
@ShaunaDiaz ShaunaDiaz force-pushed the OSDOCS-13626 branch 3 times, most recently from b6ad2a5 to 7fe575d Compare August 13, 2025 12:58
@ShaunaDiaz
Copy link
Contributor Author

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 17, 2025

@ShaunaDiaz: This pull request references OSDOCS-13626 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target either version "4.21." or "openshift-4.21.", but it targets "openshift-4.20" instead.

In response to this:

Version(s):
4.18+

Issue:
OSDOCS-13626

Link to docs preview:
https://97064--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror.html
https://97064--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror-disconnected#oc-mirror-dry-run_microshift-operators-oc-mirror-disconnected

QE review:

  • QE has approved this change.

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.

@ShaunaDiaz ShaunaDiaz added merge-review-needed Signifies that the merge review team needs to review this PR do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Sep 17, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 17, 2025

@ShaunaDiaz: This pull request references OSDOCS-13626 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target either version "4.21." or "openshift-4.21.", but it targets "openshift-4.20" instead.

In response to this:

Version(s):
4.18+

Issue:
OSDOCS-13626

Link to docs preview:
https://97064--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror.html
https://97064--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror-disconnected#oc-mirror-dry-run_microshift-operators-oc-mirror-disconnected

QE review:

  • QE has approved this change.

Additional info: QE is still testing, so please review and place an ok-to-merge label if all is well. I'll merge it when QE is done testing in case there are small changes.

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.

@lahinson lahinson 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 Sep 17, 2025
Copy link
Contributor

@lahinson lahinson left a comment

Choose a reason for hiding this comment

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

@ShaunaDiaz I made a few suggestions for you to consider, either for this PR or a separate one. I'll leave this in your hands to merge :)

@lahinson lahinson removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Sep 17, 2025
Copy link

openshift-ci bot commented Sep 18, 2025

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

@ShaunaDiaz ShaunaDiaz removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 19, 2025
@ShaunaDiaz ShaunaDiaz merged commit e7bcf4c into openshift:main Sep 19, 2025
2 checks passed
@ShaunaDiaz
Copy link
Contributor Author

/cherrypick enterprise-4.20

@ShaunaDiaz
Copy link
Contributor Author

/cherrypick enterprise-4.19

@ShaunaDiaz
Copy link
Contributor Author

/cherrypick enterprise-4.18

@openshift-cherrypick-robot

@ShaunaDiaz: #97064 failed to apply on top of branch "enterprise-4.19":

Applying: OSDOCS-13626: updates oc mirror to v2
Using index info to reconstruct a base tree...
M	modules/microshift-oc-mirror-creating-imageset-config.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/microshift-oc-mirror-creating-imageset-config.adoc
CONFLICT (content): Merge conflict in modules/microshift-oc-mirror-creating-imageset-config.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 advice.mergeConflict false"
Patch failed at 0001 OSDOCS-13626: updates oc mirror to v2

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

@ShaunaDiaz: new pull request created: #99388

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

@ShaunaDiaz: #97064 failed to apply on top of branch "enterprise-4.18":

Patch is empty.
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 record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

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.

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

Labels

branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants