Skip to content

Conversation

@jherrman
Copy link
Contributor

@jherrman jherrman commented Sep 3, 2024

Version(s):
4.15

Issue:
https://issues.redhat.com/browse/CNV-38323

Link to docs preview:
TBA

QE review:

  • QE has approved this change.

Additional information:
A sort-of-clone for #78023 aimed to avoid cherry-pick conflicts

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 3, 2024
@ocpdocs-previewbot
Copy link

🤖 Tue Sep 03 14:40:24 - Prow CI generated the docs preview:

https://81240--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/release_notes/virt-4-17-release-notes.html

@openshift-ci
Copy link

openshift-ci bot commented Sep 3, 2024

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

@jherrman
Copy link
Contributor Author

jherrman commented Sep 4, 2024

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Sep 4, 2024
@jeana-redhat jeana-redhat added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Sep 4, 2024
@jeana-redhat
Copy link
Contributor

@jherrman I am guessing this will not automatically cherrypick into 4.15-4.16, since it is going into a file called virt-4-17-release-notes.adoc. I can merge this one and try the CP commands, but you will probably need to just open two more PRs for 4.15-4.16.

Copy link
Contributor

@jeana-redhat jeana-redhat left a comment

Choose a reason for hiding this comment

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

Change LGTM

/remove-label merge-review-in-progress
/remove-label merge-review-needed

@jeana-redhat jeana-redhat added peer-review-done Signifies that the peer review team has reviewed this PR and removed 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 labels Sep 4, 2024
@jeana-redhat jeana-redhat added this to the Continuous Release milestone Sep 4, 2024
@openshift-ci
Copy link

openshift-ci bot commented Sep 4, 2024

@jeana-redhat: Those labels are not set on the issue: merge-review-in-progress, merge-review-needed

In response to this:

Change LGTM

/remove-label merge-review-in-progress
/remove-label merge-review-needed

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.

@jeana-redhat jeana-redhat merged commit f140ac0 into openshift:enterprise-4.17 Sep 4, 2024
@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@jeana-redhat: #81240 failed to apply on top of branch "enterprise-4.16":

Applying: CNV-38323 - Adding BZ#2151169 to known issues
Using index info to reconstruct a base tree...
A	virt/release_notes/virt-4-17-release-notes.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): virt/release_notes/virt-4-17-release-notes.adoc deleted in HEAD and modified in CNV-38323 - Adding BZ#2151169 to known issues. Version CNV-38323 - Adding BZ#2151169 to known issues of virt/release_notes/virt-4-17-release-notes.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 CNV-38323 - Adding BZ#2151169 to known issues
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

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.

@jeana-redhat
Copy link
Contributor

ok yeah this is not going to cherry pick by itself. Please open manual ones and tag for merge, you can link to this one to show that they are simply cherrypicks :)

@jherrman
Copy link
Contributor Author

jherrman commented Sep 6, 2024

@jeana-redhat , right, I guess the cherry-pick was wishful thinking on my part >_< I'll go ahead and create the other PRs for 4.15 and 4.16. Thank you for trying anyway :-)

@jherrman
Copy link
Contributor Author

jherrman commented Sep 6, 2024

@jeana-redhat , so turns out I messed up and placed the description into an incorrect section :-/ I pushed a commit to fix it into the branch, but it doesn't seem to be even registering, probably since the PR is closed. I guess I'll create one extra PR for this, too, then... :-)

@jherrman jherrman changed the title OSDOCS#38323: Adding BZ#2151169 to known issues in 4.15 - 4.17 OSDOCS#38323: Adding BZ#2151169 to known issues in 4.17 Sep 6, 2024
@jeana-redhat
Copy link
Contributor

@jeana-redhat , so turns out I messed up and placed the description into an incorrect section :-/ I pushed a commit to fix it into the branch, but it doesn't seem to be even registering, probably since the PR is closed. I guess I'll create one extra PR for this, too, then... :-)

yeah, I think that's right - can't push if it's merged.

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

Labels

peer-review-done Signifies that the peer review team has reviewed this PR size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants