Skip to content

OSDOCS-16880-3: CQA IMG-2: Image Configuration and Advanced Features #102851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
dfitzmau merged 1 commit into from
Dec 3, 2025
Merged

OSDOCS-16880-3: CQA IMG-2: Image Configuration and Advanced Features #102851

dfitzmau merged 1 commit into from
Dec 3, 2025

Conversation

@ShaunaDiaz
Copy link
Contributor

@ShaunaDiaz ShaunaDiaz commented Nov 20, 2025 •
edited
Loading

Version(s):
4.16+

Issue:
OSDOCS-16880

Link to docs preview:

core OCP
Configuring credentials that allow images to be mirrored
About the mirror registry
Using Cluster Samples Operator image streams with alternate or mirrored registries

ROSA
https://102851--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/openshift_images/image-configuration-hcp.html
https://102851--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/openshift_images/samples-operator-alt-registry.html
https://102851--ocpdocs-pr.netlify.app/openshift-rosa/latest/openshift_images/samples-operator-alt-registry.html

OSD
https://102851--ocpdocs-pr.netlify.app/openshift-dedicated/latest/openshift_images/samples-operator-alt-registry.html

QE review:
N/A migrations issues only, no technical changes

Additional information:
See #102416 for part 1 and #102644 for part 2 of this CQA task

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

openshift-ci-robot commented Nov 20, 2025 •
edited by openshift-ci bot
Loading

@ShaunaDiaz: This pull request references OSDOCS-16880 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 "aem-migration" instead.

Details

In response to this:

Version(s):
4.16+

Issue:
OSDOCS-16880

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:
See #102416 for part 1 and #102644 for part 2 of this CQA task

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 the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 20, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Nov 20, 2025 •
edited
Loading

🤖 Tue Dec 02 18:46:14 - Prow CI generated the docs preview:
https://102851--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 21, 2025 •
edited by openshift-ci bot
Loading

@ShaunaDiaz: This pull request references OSDOCS-16880 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 "aem-migration" instead.

Details

In response to this:

Version(s):
4.16+

Issue:
OSDOCS-16880

Link to docs preview:

core OCP
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/about-installing-oc-mirror-v2.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/connected-to-disconnected.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/installing-mirroring-disconnected.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/installing-mirroring-installation-images.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/updating/mirroring-image-repository.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/openshift_images/samples-operator-alt-registry.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/post_installation_configuration/post-install-image-config.html

ROSA
https://102851--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/openshift_images/image-configuration-hcp.html
https://102851--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/openshift_images/samples-operator-alt-registry.html
https://102851--ocpdocs-pr.netlify.app/openshift-rosa/latest/openshift_images/samples-operator-alt-registry.html

OSD
https://102851--ocpdocs-pr.netlify.app/openshift-dedicated/latest/openshift_images/samples-operator-alt-registry.html

QE review:

  • QE has approved this change.

Additional information:
See #102416 for part 1 and #102644 for part 2 of this CQA task

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
Copy link

openshift-ci-robot commented Nov 21, 2025 •
edited by openshift-ci bot
Loading

@ShaunaDiaz: This pull request references OSDOCS-16880 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 "aem-migration" instead.

Details

In response to this:

Version(s):
4.16+

Issue:
OSDOCS-16880

Link to docs preview:

core OCP
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/about-installing-oc-mirror-v2.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/connected-to-disconnected.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/installing-mirroring-disconnected.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/installing-mirroring-installation-images.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/updating/mirroring-image-repository.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/openshift_images/samples-operator-alt-registry.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/post_installation_configuration/post-install-image-config.html

ROSA
https://102851--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/openshift_images/image-configuration-hcp.html
https://102851--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/openshift_images/samples-operator-alt-registry.html
https://102851--ocpdocs-pr.netlify.app/openshift-rosa/latest/openshift_images/samples-operator-alt-registry.html

OSD
https://102851--ocpdocs-pr.netlify.app/openshift-dedicated/latest/openshift_images/samples-operator-alt-registry.html

QE review:
N/A migrations issues only, no technical changes

Additional information:
See #102416 for part 1 and #102644 for part 2 of this CQA task

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
Copy link

openshift-ci-robot commented Nov 21, 2025 •
edited by openshift-ci bot
Loading

@ShaunaDiaz: This pull request references OSDOCS-16880 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 "aem-migration" instead.

Details

In response to this:

Version(s):
4.16+

Issue:
OSDOCS-16880

Link to docs preview:

core OCP
Configuring credentials that allow images to be mirrored
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/connected-to-disconnected.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/installing-mirroring-disconnected.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/installing-mirroring-installation-images.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/updating/mirroring-image-repository.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/openshift_images/samples-operator-alt-registry.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/post_installation_configuration/post-install-image-config.html

ROSA
https://102851--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/openshift_images/image-configuration-hcp.html
https://102851--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/openshift_images/samples-operator-alt-registry.html
https://102851--ocpdocs-pr.netlify.app/openshift-rosa/latest/openshift_images/samples-operator-alt-registry.html

OSD
https://102851--ocpdocs-pr.netlify.app/openshift-dedicated/latest/openshift_images/samples-operator-alt-registry.html

QE review:
N/A migrations issues only, no technical changes

Additional information:
See #102416 for part 1 and #102644 for part 2 of this CQA task

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
Copy link

openshift-ci-robot commented Nov 21, 2025 •
edited by openshift-ci bot
Loading

@ShaunaDiaz: This pull request references OSDOCS-16880 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 "aem-migration" instead.

Details

In response to this:

Version(s):
4.16+

Issue:
OSDOCS-16880

Link to docs preview:

core OCP
Configuring credentials that allow images to be mirrored
About the mirror registry
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/installing-mirroring-disconnected.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/installing-mirroring-installation-images.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/updating/mirroring-image-repository.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/openshift_images/samples-operator-alt-registry.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/post_installation_configuration/post-install-image-config.html

ROSA
https://102851--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/openshift_images/image-configuration-hcp.html
https://102851--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/openshift_images/samples-operator-alt-registry.html
https://102851--ocpdocs-pr.netlify.app/openshift-rosa/latest/openshift_images/samples-operator-alt-registry.html

OSD
https://102851--ocpdocs-pr.netlify.app/openshift-dedicated/latest/openshift_images/samples-operator-alt-registry.html

QE review:
N/A migrations issues only, no technical changes

Additional information:
See #102416 for part 1 and #102644 for part 2 of this CQA task

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
Copy link

openshift-ci-robot commented Nov 21, 2025 •
edited by openshift-ci bot
Loading

@ShaunaDiaz: This pull request references OSDOCS-16880 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 "aem-migration" instead.

Details

In response to this:

Version(s):
4.16+

Issue:
OSDOCS-16880

Link to docs preview:

core OCP
Configuring credentials that allow images to be mirrored
About the mirror registry
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/updating/mirroring-image-repository.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/openshift_images/samples-operator-alt-registry.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/post_installation_configuration/post-install-image-config.html

ROSA
https://102851--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/openshift_images/image-configuration-hcp.html
https://102851--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/openshift_images/samples-operator-alt-registry.html
https://102851--ocpdocs-pr.netlify.app/openshift-rosa/latest/openshift_images/samples-operator-alt-registry.html

OSD
https://102851--ocpdocs-pr.netlify.app/openshift-dedicated/latest/openshift_images/samples-operator-alt-registry.html

QE review:
N/A migrations issues only, no technical changes

Additional information:
See #102416 for part 1 and #102644 for part 2 of this CQA task

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
Copy link

openshift-ci-robot commented Nov 21, 2025 •
edited by openshift-ci bot
Loading

@ShaunaDiaz: This pull request references OSDOCS-16880 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 "aem-migration" instead.

Details

In response to this:

Version(s):
4.16+

Issue:
OSDOCS-16880

Link to docs preview:

core OCP
Configuring credentials that allow images to be mirrored
About the mirror registry
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/openshift_images/samples-operator-alt-registry.html
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/post_installation_configuration/post-install-image-config.html

ROSA
https://102851--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/openshift_images/image-configuration-hcp.html
https://102851--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/openshift_images/samples-operator-alt-registry.html
https://102851--ocpdocs-pr.netlify.app/openshift-rosa/latest/openshift_images/samples-operator-alt-registry.html

OSD
https://102851--ocpdocs-pr.netlify.app/openshift-dedicated/latest/openshift_images/samples-operator-alt-registry.html

QE review:
N/A migrations issues only, no technical changes

Additional information:
See #102416 for part 1 and #102644 for part 2 of this CQA task

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
Copy link

openshift-ci-robot commented Nov 21, 2025 •
edited by openshift-ci bot
Loading

@ShaunaDiaz: This pull request references OSDOCS-16880 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 "aem-migration" instead.

Details

In response to this:

Version(s):
4.16+

Issue:
OSDOCS-16880

Link to docs preview:

core OCP
Configuring credentials that allow images to be mirrored
About the mirror registry
Using Cluster Samples Operator image streams with alternate or mirrored registries
https://102851--ocpdocs-pr.netlify.app/openshift-enterprise/latest/post_installation_configuration/post-install-image-config.html

ROSA
https://102851--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/openshift_images/image-configuration-hcp.html
https://102851--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/openshift_images/samples-operator-alt-registry.html
https://102851--ocpdocs-pr.netlify.app/openshift-rosa/latest/openshift_images/samples-operator-alt-registry.html

OSD
https://102851--ocpdocs-pr.netlify.app/openshift-dedicated/latest/openshift_images/samples-operator-alt-registry.html

QE review:
N/A migrations issues only, no technical changes

Additional information:
See #102416 for part 1 and #102644 for part 2 of this CQA task

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
Copy link

openshift-ci-robot commented Nov 21, 2025 •
edited by openshift-ci bot
Loading

@ShaunaDiaz: This pull request references OSDOCS-16880 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 "aem-migration" instead.

Details

In response to this:

Version(s):
4.16+

Issue:
OSDOCS-16880

Link to docs preview:

core OCP
Configuring credentials that allow images to be mirrored
About the mirror registry
Using Cluster Samples Operator image streams with alternate or mirrored registries

ROSA
https://102851--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/openshift_images/image-configuration-hcp.html
https://102851--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/openshift_images/samples-operator-alt-registry.html
https://102851--ocpdocs-pr.netlify.app/openshift-rosa/latest/openshift_images/samples-operator-alt-registry.html

OSD
https://102851--ocpdocs-pr.netlify.app/openshift-dedicated/latest/openshift_images/samples-operator-alt-registry.html

QE review:
N/A migrations issues only, no technical changes

Additional information:
See #102416 for part 1 and #102644 for part 2 of this CQA task

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.

dfitzmau
dfitzmau reviewed Nov 21, 2025
View reviewed changes
@dfitzmau
Copy link
Contributor

dfitzmau commented Nov 21, 2025

Nice work, @ShaunaDiaz . I've finished my review. Please reach out if you have any questions.

@ShaunaDiaz ShaunaDiaz force-pushed the OSDOCS-16880-3 branch 2 times, most recently from 2573a8c to 4ebb0fe Compare December 2, 2025 18:36
@ShaunaDiaz
Copy link
Contributor Author

ShaunaDiaz commented Dec 2, 2025

/test validate-portal

@openshift-ci
Copy link

openshift-ci bot commented Dec 2, 2025

@ShaunaDiaz: 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 dfitzmau merged commit 8f9de03 into openshift:main Dec 3, 2025
2 checks passed
@dfitzmau
Copy link
Contributor

dfitzmau commented Dec 3, 2025

/cherrypick enterprise-4.21

@dfitzmau
Copy link
Contributor

dfitzmau commented Dec 3, 2025

/cherrypick enterprise-4.20

@dfitzmau
Copy link
Contributor

dfitzmau commented Dec 3, 2025

/cherrypick enterprise-4.19

@dfitzmau
Copy link
Contributor

dfitzmau commented Dec 3, 2025

/cherrypick enterprise-4.18

@dfitzmau
Copy link
Contributor

dfitzmau commented Dec 3, 2025

/cherrypick enterprise-4.17

@dfitzmau
Copy link
Contributor

dfitzmau commented Dec 3, 2025

/cherrypick enterprise-4.16

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Dec 3, 2025
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 3, 2025

@dfitzmau: new pull request created: #103322

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
Copy link

openshift-cherrypick-robot commented Dec 3, 2025

@dfitzmau: new pull request created: #103323

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 openshift-cherrypick-robot mentioned this pull request Dec 3, 2025
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 3, 2025

@dfitzmau: new pull request created: #103324

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 openshift-cherrypick-robot mentioned this pull request Dec 3, 2025
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 3, 2025

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

Applying: OSDOCS-16880-3: CQA IMG-2: Image Configuration and Advanced Features
Using index info to reconstruct a base tree...
A	modules/images-registry-mirroring.adoc
M	modules/installation-mirror-repository.adoc
M	openshift_images/samples-operator-alt-registry.adoc
Falling back to patching base and 3-way merge...
Auto-merging openshift_images/samples-operator-alt-registry.adoc
CONFLICT (content): Merge conflict in openshift_images/samples-operator-alt-registry.adoc
Auto-merging modules/installation-mirror-repository.adoc
CONFLICT (modify/delete): modules/images-registry-mirroring.adoc deleted in HEAD and modified in OSDOCS-16880-3: CQA IMG-2: Image Configuration and Advanced Features. Version OSDOCS-16880-3: CQA IMG-2: Image Configuration and Advanced Features of modules/images-registry-mirroring.adoc left in tree.
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-16880-3: CQA IMG-2: Image Configuration and Advanced Features
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
Copy link

openshift-cherrypick-robot commented Dec 3, 2025

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

Applying: OSDOCS-16880-3: CQA IMG-2: Image Configuration and Advanced Features
Using index info to reconstruct a base tree...
A	modules/images-registry-mirroring.adoc
M	modules/installation-mirror-repository.adoc
M	openshift_images/samples-operator-alt-registry.adoc
Falling back to patching base and 3-way merge...
Auto-merging openshift_images/samples-operator-alt-registry.adoc
CONFLICT (content): Merge conflict in openshift_images/samples-operator-alt-registry.adoc
Auto-merging modules/installation-mirror-repository.adoc
CONFLICT (modify/delete): modules/images-registry-mirroring.adoc deleted in HEAD and modified in OSDOCS-16880-3: CQA IMG-2: Image Configuration and Advanced Features. Version OSDOCS-16880-3: CQA IMG-2: Image Configuration and Advanced Features of modules/images-registry-mirroring.adoc left in tree.
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-16880-3: CQA IMG-2: Image Configuration and Advanced Features
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
Copy link

openshift-cherrypick-robot commented Dec 3, 2025

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

Applying: OSDOCS-16880-3: CQA IMG-2: Image Configuration and Advanced Features
Using index info to reconstruct a base tree...
A	modules/images-registry-mirroring.adoc
M	modules/installation-adding-registry-pull-secret.adoc
M	modules/installation-mirror-repository.adoc
M	openshift_images/samples-operator-alt-registry.adoc
Falling back to patching base and 3-way merge...
Auto-merging openshift_images/samples-operator-alt-registry.adoc
CONFLICT (content): Merge conflict in openshift_images/samples-operator-alt-registry.adoc
Auto-merging modules/installation-mirror-repository.adoc
Auto-merging modules/installation-adding-registry-pull-secret.adoc
CONFLICT (content): Merge conflict in modules/installation-adding-registry-pull-secret.adoc
CONFLICT (modify/delete): modules/images-registry-mirroring.adoc deleted in HEAD and modified in OSDOCS-16880-3: CQA IMG-2: Image Configuration and Advanced Features. Version OSDOCS-16880-3: CQA IMG-2: Image Configuration and Advanced Features of modules/images-registry-mirroring.adoc left in tree.
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-16880-3: CQA IMG-2: Image Configuration and Advanced Features
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.

This was referenced Dec 3, 2025
Merged
Merged
Merged
@ShaunaDiaz ShaunaDiaz deleted the OSDOCS-16880-3 branch January 6, 2026 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dfitzmau dfitzmau dfitzmau left review comments

@snarayan-redhat snarayan-redhat snarayan-redhat left review comments

Assignees

No one assigned

Labels

branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 branch/enterprise-4.21 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@ShaunaDiaz @openshift-ci-robot @ocpdocs-previewbot @dfitzmau @openshift-cherrypick-robot @snarayan-redhat