Skip to content

Conversation

@ousleyp
Copy link
Member

@ousleyp ousleyp commented Apr 14, 2025

@ousleyp ousleyp added the CNV Label for all CNV PRs label Apr 14, 2025
@ousleyp ousleyp added this to the Continuous Release milestone Apr 14, 2025
@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 14, 2025
@ousleyp ousleyp force-pushed the cnv-59760 branch 2 times, most recently from 135e844 to 8a8db16 Compare April 14, 2025 21:12
@ousleyp
Copy link
Member Author

ousleyp commented Apr 21, 2025

/retest

@ousleyp ousleyp closed this Apr 23, 2025
@ousleyp ousleyp reopened this Apr 23, 2025
@ousleyp ousleyp force-pushed the cnv-59760 branch 2 times, most recently from 6ead350 to fa3c0ad Compare April 23, 2025 18:40
@openshift-ci openshift-ci bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 24, 2025
@openshift-ci
Copy link

openshift-ci bot commented Apr 24, 2025

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

@ousleyp ousleyp added the peer-review-needed Signifies that the peer review team needs to review this PR label Apr 24, 2025
@jneczypor
Copy link
Contributor

/label peer-review-in-progress

@openshift-ci openshift-ci bot added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Apr 24, 2025
Copy link
Contributor

@jneczypor jneczypor left a comment

Choose a reason for hiding this comment

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

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

@openshift-ci openshift-ci bot added the peer-review-done Signifies that the peer review team has reviewed this PR label Apr 24, 2025
@openshift-ci openshift-ci bot 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 Apr 24, 2025
@ousleyp ousleyp merged commit 69cb73e into openshift:main Apr 25, 2025
2 checks passed
@ousleyp
Copy link
Member Author

ousleyp commented Apr 25, 2025

/cherrypick enterprise-4.19

@ousleyp
Copy link
Member Author

ousleyp commented Apr 25, 2025

/cherrypick enterprise-4.18

@ousleyp
Copy link
Member Author

ousleyp commented Apr 25, 2025

/cherrypick enterprise-4.17

@openshift-cherrypick-robot

@ousleyp: #92158 failed to apply on top of branch "enterprise-4.19":

Applying: CNV#59760: fix supported limits links
Using index info to reconstruct a base tree...
M	virt/about_virt/about-virt.adoc
Falling back to patching base and 3-way merge...
Auto-merging virt/about_virt/about-virt.adoc
CONFLICT (content): Merge conflict in virt/about_virt/about-virt.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 CNV#59760: fix supported limits links

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

@ousleyp: new pull request created: #92633

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

@ousleyp: #92158 failed to apply on top of branch "enterprise-4.17":

Applying: CNV#59760: fix supported limits links
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map_rosa.yml
M	virt/about_virt/about-virt.adoc
M	virt/install/preparing-cluster-for-virt.adoc
Falling back to patching base and 3-way merge...
Auto-merging virt/install/preparing-cluster-for-virt.adoc
Auto-merging virt/about_virt/about-virt.adoc
CONFLICT (content): Merge conflict in virt/about_virt/about-virt.adoc
Auto-merging _topic_maps/_topic_map_rosa.yml
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 CNV#59760: fix supported limits links

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.

@ousleyp
Copy link
Member Author

ousleyp commented Apr 25, 2025

@ousleyp: #92158 failed to apply on top of branch "enterprise-4.19":

Applying: CNV#59760: fix supported limits links
Using index info to reconstruct a base tree...
M	virt/about_virt/about-virt.adoc
Falling back to patching base and 3-way merge...
Auto-merging virt/about_virt/about-virt.adoc
CONFLICT (content): Merge conflict in virt/about_virt/about-virt.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 CNV#59760: fix supported limits links

Opened #92636 to fix the about-virt file so that it matches main. (Removing the placeholder contents.) Will re-try the auto cherrypick after merging that PR.

Update: decided to just manually cherrypick.

@ousleyp
Copy link
Member Author

ousleyp commented Apr 29, 2025

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@ousleyp: #92158 failed to apply on top of branch "enterprise-4.16":

Applying: CNV#59760: fix supported limits links
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map_rosa.yml
M	virt/about_virt/about-virt.adoc
M	virt/install/preparing-cluster-for-virt.adoc
Falling back to patching base and 3-way merge...
Auto-merging virt/install/preparing-cluster-for-virt.adoc
Auto-merging virt/about_virt/about-virt.adoc
CONFLICT (content): Merge conflict in virt/about_virt/about-virt.adoc
Auto-merging _topic_maps/_topic_map_rosa.yml
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 CNV#59760: fix supported limits links

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.

@ousleyp
Copy link
Member Author

ousleyp commented Apr 29, 2025

/cherrypick enterprise-4.15

@ousleyp
Copy link
Member Author

ousleyp commented Apr 29, 2025

/cherrypick enterprise-4.14

@ousleyp
Copy link
Member Author

ousleyp commented Apr 29, 2025

/cherrypick enterprise-4.13

@openshift-cherrypick-robot

@ousleyp: new pull request created: #92740

Details

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

@ousleyp: #92158 failed to apply on top of branch "enterprise-4.14":

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

@ousleyp: #92158 failed to apply on top of branch "enterprise-4.13":

Applying: CNV#59760: fix supported limits links
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map_rosa.yml
A	virt/about_virt/about-virt.adoc
M	virt/install/preparing-cluster-for-virt.adoc
Falling back to patching base and 3-way merge...
Auto-merging virt/install/preparing-cluster-for-virt.adoc
CONFLICT (content): Merge conflict in virt/install/preparing-cluster-for-virt.adoc
CONFLICT (modify/delete): virt/about_virt/about-virt.adoc deleted in HEAD and modified in CNV#59760: fix supported limits links. Version CNV#59760: fix supported limits links of virt/about_virt/about-virt.adoc left in tree.
Auto-merging _topic_maps/_topic_map_rosa.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map_rosa.yml
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 CNV#59760: fix supported limits links

Details

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.

@ousleyp
Copy link
Member Author

ousleyp commented Apr 29, 2025

/cherrypick enterprise-4.12

@openshift-cherrypick-robot

@ousleyp: #92158 failed to apply on top of branch "enterprise-4.12":

Applying: CNV#59760: fix supported limits links
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map_rosa.yml
A	virt/about_virt/about-virt.adoc
M	virt/install/preparing-cluster-for-virt.adoc
Falling back to patching base and 3-way merge...
Auto-merging virt/install/preparing-cluster-for-virt.adoc
CONFLICT (content): Merge conflict in virt/install/preparing-cluster-for-virt.adoc
CONFLICT (modify/delete): virt/about_virt/about-virt.adoc deleted in HEAD and modified in CNV#59760: fix supported limits links. Version CNV#59760: fix supported limits links of virt/about_virt/about-virt.adoc left in tree.
Auto-merging _topic_maps/_topic_map_rosa.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map_rosa.yml
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 CNV#59760: fix supported limits links

Details

In response to this:

/cherrypick enterprise-4.12

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants