Skip to content

Conversation

@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 17, 2025

@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:
https://issues.redhat.com/browse/OSDOCS-16880

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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 openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 17, 2025
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 17, 2025
@ShaunaDiaz ShaunaDiaz changed the title [WIP] OSDOCS-16880-2: CQAIMG-2: image config and adv features [WIP] OSDOCS-16880-2: CQA-IMG-2: image config and adv features Nov 17, 2025
@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 17, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 17, 2025

@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:
https://issues.redhat.com/browse/OSDOCS-16880

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:
See #102416 for part 1 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 17, 2025

@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:
https://issues.redhat.com/browse/OSDOCS-16880

Link to docs preview:

Reviews:

  • QE, N/A no technical updates
    -[] ROSA/ROSA HCP writer review
    -[] OSD writer review

Additional information:
See #102416 for part 1 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 17, 2025

@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:
https://issues.redhat.com/browse/OSDOCS-16880

Link to docs preview:

Reviews:

  • QE, N/A no technical updates
  • ROSA/ROSA HCP writer review
  • OSD writer review

Additional information:
See #102416 for part 1 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.

@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Nov 17, 2025

🤖 Wed Dec 03 12:32:10 - Prow CI generated the docs preview:
https://102644--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@openshift-ci openshift-ci bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 18, 2025
@ShaunaDiaz ShaunaDiaz changed the title [WIP] OSDOCS-16880-2: CQA-IMG-2: image config and adv features OSDOCS-16880-2: CQA-IMG-2: image config and adv features Nov 18, 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 Nov 18, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 18, 2025

@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:
(https://issues.redhat.com/browse/OSDOCS-16880)[OSDOCS-16880]

Link to docs preview:

Reviews:

  • QE, N/A no technical updates
  • ROSA/ROSA HCP writer review
  • OSD writer review

Additional information:
See #102416 for part 1 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 19, 2025

@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:
https://issues.redhat.com/browse/OSDOCS-16880

Link to docs preview:

Reviews:

  • QE, N/A no technical updates
  • ROSA/ROSA HCP writer review
  • OSD writer review

Additional information:
See #102416 for part 1 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 19, 2025

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

Reviews:

  • QE, N/A no technical updates
  • ROSA/ROSA HCP writer review
  • OSD writer review

Additional information:
See #102416 for part 1 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 19, 2025

@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://102644--ocpdocs-pr.netlify.app/openshift-enterprise/latest/openshift_images/image-configuration.html
https://102644--ocpdocs-pr.netlify.app/openshift-enterprise/latest/openshift_images/samples-operator-alt-registry.html
https://102644--ocpdocs-pr.netlify.app/openshift-enterprise/latest/post_installation_configuration/post-install-image-config.html

OSD
https://102644--ocpdocs-pr.netlify.app/openshift-dedicated/latest/openshift_images/image-configuration.html
https://102644--ocpdocs-pr.netlify.app/openshift-dedicated/latest/openshift_images/samples-operator-alt-registry.html
https://102644--ocpdocs-pr.netlify.app/openshift-enterprise/latest/post_installation_configuration/post-install-image-config.html

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

Reviews:

  • QE, N/A no technical updates
  • ROSA/ROSA HCP writer review
  • OSD writer review

Additional information:
See #102416 for part 1 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.

@ShaunaDiaz ShaunaDiaz force-pushed the OSDOCS-16880-2 branch 2 times, most recently from f5f37e1 to 1b655dd Compare November 20, 2025 18:13
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 20, 2025
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 2, 2025
@ShaunaDiaz ShaunaDiaz force-pushed the OSDOCS-16880-2 branch 2 times, most recently from 2bc6205 to 91640d6 Compare December 2, 2025 19:48
@ShaunaDiaz ShaunaDiaz removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 3, 2025
@openshift-ci
Copy link

openshift-ci bot commented Dec 3, 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.

@ShaunaDiaz ShaunaDiaz merged commit 1c53d3d into openshift:main Dec 3, 2025
2 checks passed
@ShaunaDiaz
Copy link
Contributor Author

/cherrypick enterprise-4.21

@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

@ShaunaDiaz
Copy link
Contributor Author

/cherrypick enterprise-4.17

@ShaunaDiaz
Copy link
Contributor Author

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@ShaunaDiaz: #102644 failed to apply on top of branch "enterprise-4.21":

Applying: OSDOCS-16880-2: CQAIMG-2: image config and adv features
Using index info to reconstruct a base tree...
M	modules/images-configuration-allowed.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/images-configuration-allowed.adoc
CONFLICT (content): Merge conflict in modules/images-configuration-allowed.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-16880-2: CQAIMG-2: image config and adv features

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

@ShaunaDiaz: #102644 failed to apply on top of branch "enterprise-4.20":

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"

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

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

Applying: OSDOCS-16880-2: CQAIMG-2: image config and adv features
Using index info to reconstruct a base tree...
M	_attributes/attributes-openshift-dedicated.adoc
M	modules/images-configuration-allowed.adoc
M	modules/images-configuration-file.adoc
M	modules/images-configuration-registry-mirror-configuring.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/images-configuration-registry-mirror-configuring.adoc
Auto-merging modules/images-configuration-file.adoc
Auto-merging modules/images-configuration-allowed.adoc
CONFLICT (content): Merge conflict in modules/images-configuration-allowed.adoc
Auto-merging _attributes/attributes-openshift-dedicated.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-16880-2: CQAIMG-2: image config and adv features

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

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

Applying: OSDOCS-16880-2: CQAIMG-2: image config and adv features
Using index info to reconstruct a base tree...
M	_attributes/attributes-openshift-dedicated.adoc
M	modules/images-configuration-allowed.adoc
M	modules/images-configuration-file.adoc
M	modules/images-configuration-registry-mirror-configuring.adoc
M	openshift_images/image-configuration.adoc
Falling back to patching base and 3-way merge...
Auto-merging openshift_images/image-configuration.adoc
CONFLICT (content): Merge conflict in openshift_images/image-configuration.adoc
Auto-merging modules/images-configuration-registry-mirror-configuring.adoc
Auto-merging modules/images-configuration-file.adoc
Auto-merging modules/images-configuration-allowed.adoc
CONFLICT (content): Merge conflict in modules/images-configuration-allowed.adoc
Auto-merging _attributes/attributes-openshift-dedicated.adoc
CONFLICT (content): Merge conflict in _attributes/attributes-openshift-dedicated.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-16880-2: CQAIMG-2: image config and adv 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

@ShaunaDiaz: #102644 failed to apply on top of branch "enterprise-4.17":

Applying: OSDOCS-16880-2: CQAIMG-2: image config and adv features
Using index info to reconstruct a base tree...
M	_attributes/attributes-openshift-dedicated.adoc
M	modules/images-configuration-allowed.adoc
M	modules/images-configuration-file.adoc
M	modules/images-configuration-parameters.adoc
M	modules/images-configuration-registry-mirror-configuring.adoc
M	openshift_images/image-configuration.adoc
Falling back to patching base and 3-way merge...
Auto-merging openshift_images/image-configuration.adoc
CONFLICT (content): Merge conflict in openshift_images/image-configuration.adoc
Auto-merging modules/images-configuration-registry-mirror-configuring.adoc
Auto-merging modules/images-configuration-parameters.adoc
CONFLICT (content): Merge conflict in modules/images-configuration-parameters.adoc
Auto-merging modules/images-configuration-file.adoc
Auto-merging modules/images-configuration-allowed.adoc
CONFLICT (content): Merge conflict in modules/images-configuration-allowed.adoc
Auto-merging _attributes/attributes-openshift-dedicated.adoc
CONFLICT (content): Merge conflict in _attributes/attributes-openshift-dedicated.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-16880-2: CQAIMG-2: image config and adv 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

@ShaunaDiaz: #102644 failed to apply on top of branch "enterprise-4.16":

Applying: OSDOCS-16880-2: CQAIMG-2: image config and adv features
Using index info to reconstruct a base tree...
M	_attributes/attributes-openshift-dedicated.adoc
M	modules/images-configuration-file.adoc
M	modules/images-configuration-parameters.adoc
M	modules/images-configuration-registry-mirror-configuring.adoc
M	openshift_images/image-configuration.adoc
Falling back to patching base and 3-way merge...
Auto-merging openshift_images/image-configuration.adoc
CONFLICT (content): Merge conflict in openshift_images/image-configuration.adoc
Auto-merging modules/images-configuration-registry-mirror-configuring.adoc
Auto-merging modules/images-configuration-parameters.adoc
CONFLICT (content): Merge conflict in modules/images-configuration-parameters.adoc
Auto-merging modules/images-configuration-file.adoc
CONFLICT (content): Merge conflict in modules/images-configuration-file.adoc
Auto-merging _attributes/attributes-openshift-dedicated.adoc
CONFLICT (content): Merge conflict in _attributes/attributes-openshift-dedicated.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-16880-2: CQAIMG-2: image config and adv 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.

@ShaunaDiaz
Copy link
Contributor Author

/cherrypick enterprise-4.21

@openshift-cherrypick-robot

@ShaunaDiaz: #102644 failed to apply on top of branch "enterprise-4.21":

Applying: OSDOCS-16880-2: CQAIMG-2: image config and adv features
Using index info to reconstruct a base tree...
M	modules/images-configuration-allowed.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/images-configuration-allowed.adoc
CONFLICT (content): Merge conflict in modules/images-configuration-allowed.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-16880-2: CQAIMG-2: image config and adv features

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.

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

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/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.

10 participants