Skip to content

Conversation

@lahinson
Copy link
Contributor

@lahinson lahinson commented Aug 26, 2025

Version(s): 4.17+

Issue: https://issues.redhat.com/browse/OSDOCS-15983

Link to docs preview: https://98056--ocpdocs-pr.netlify.app/openshift-enterprise/latest/hosted_control_planes/hcp-deploy/hcp-deploy-virt.html

QE review:
Not required - this PR does not contain technical changes.

Additional information: Related to the CQA for "Deploying hosted control planes on OpenShift Virtualization"

@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Aug 26, 2025

@lahinson lahinson force-pushed the osdocs-15983-cqa-hcp-virt branch from e6306eb to 0879414 Compare August 26, 2025 17:12
@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 26, 2025
@lahinson lahinson force-pushed the osdocs-15983-cqa-hcp-virt branch from 0879414 to c501108 Compare August 26, 2025 17:37
@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 26, 2025
@lahinson lahinson force-pushed the osdocs-15983-cqa-hcp-virt branch from c501108 to bef66f6 Compare August 26, 2025 17:46
@lahinson lahinson force-pushed the osdocs-15983-cqa-hcp-virt branch from bef66f6 to 09a4fad Compare August 26, 2025 18:02
@openshift-ci
Copy link

openshift-ci bot commented Aug 26, 2025

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

@lahinson lahinson added the merge-review-needed Signifies that the merge review team needs to review this PR label Aug 26, 2025
@michaelryanpeter
Copy link
Contributor

/label merge-review-in-progress

@openshift-ci openshift-ci bot added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Aug 26, 2025
Copy link
Contributor

@michaelryanpeter michaelryanpeter left a comment

Choose a reason for hiding this comment

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

LGTM

@michaelryanpeter michaelryanpeter merged commit d7c8372 into openshift:main Aug 26, 2025
2 checks passed
@michaelryanpeter
Copy link
Contributor

/cherrypick enterprise-4.20

@michaelryanpeter
Copy link
Contributor

/cherrypick enterprise-4.19

@michaelryanpeter
Copy link
Contributor

/cherrypick enterprise4.18

@openshift-cherrypick-robot

@michaelryanpeter: new pull request created: #98062

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.

@michaelryanpeter
Copy link
Contributor

/cherrypick enterprise-4.18

@openshift-cherrypick-robot

@michaelryanpeter: new pull request created: #98063

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.

@michaelryanpeter
Copy link
Contributor

/cherrypick enterprise-4.17

@openshift-cherrypick-robot

@michaelryanpeter: cannot checkout enterprise4.18: error checking out "enterprise4.18": exit status 1 error: pathspec 'enterprise4.18' did not match any file(s) known to git

In response to this:

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

@michaelryanpeter: #98056 failed to apply on top of branch "enterprise-4.18":

Applying: Fixing non-technical issues in HCP on OpenShift Virtualization content
Using index info to reconstruct a base tree...
M	hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc
Falling back to patching base and 3-way merge...
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-deploy/hcp-deploy-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 Fixing non-technical issues in HCP on OpenShift Virtualization content

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

@michaelryanpeter: #98056 failed to apply on top of branch "enterprise-4.17":

Applying: Fixing non-technical issues in HCP on OpenShift Virtualization content
Using index info to reconstruct a base tree...
M	hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc
Falling back to patching base and 3-way merge...
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-deploy/hcp-deploy-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 Fixing non-technical issues in HCP on OpenShift Virtualization content

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.

@michaelryanpeter
Copy link
Contributor

michaelryanpeter commented Aug 26, 2025

@lahinson It looks like we'll need manual CPs for 4.17 and 4.18. Feel free to ping me with those manual CP PRs when you are ready for a merge.

@lahinson
Copy link
Contributor Author

@michaelryanpeter Thanks! I'll start on those manual CPs.

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

Labels

branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 merge-review-in-progress Signifies that the merge review team is reviewing this PR merge-review-needed Signifies that the merge review team needs to review 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.

4 participants