Skip to content

OSSM-8432: 2.6.4 (At Stage): [DOC] Release Notes#85846

Merged
ShaunaDiaz merged 1 commit intoopenshift:mainfrom
shreyasiddhartha:OSSM-8432
Dec 10, 2024
Merged

OSSM-8432: 2.6.4 (At Stage): [DOC] Release Notes#85846
ShaunaDiaz merged 1 commit intoopenshift:mainfrom
shreyasiddhartha:OSSM-8432

Conversation

@shreyasiddhartha
Copy link
Contributor

@shreyasiddhartha shreyasiddhartha commented Dec 5, 2024

@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 5, 2024

@shreyasiddhartha: This pull request references OSSM-8432 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 the "4.19.0" version, but no target version was set.

Details

In response to this:

Change type: Doc update; OSSM 2.6.4 (At Stage): Release Notes

Doc JIRA: https://issues.redhat.com/browse/OSSM-8432

Fix Version: 4.14+

Doc Preview:

SME Review:
QE Review:
Peer Review:

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 Dec 5, 2024
@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 5, 2024
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Dec 5, 2024

🤖 Tue Dec 10 10:38:47 - Prow CI generated the docs preview:
https://85846--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 6, 2024

@shreyasiddhartha: This pull request references OSSM-8432 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 the "4.19.0" version, but no target version was set.

Details

In response to this:

Change type: Doc update; OSSM 2.6.4 (At Stage): Release Notes

Doc JIRA: https://issues.redhat.com/browse/OSSM-8432

Fix Version: 4.14+

Doc Preview: https://85846--ocpdocs-pr.netlify.app/openshift-enterprise/latest/service_mesh/v2x/servicemesh-release-notes#ossm-release-2-6-4_ossm-release-notes

SME Review:
QE Review:
Peer Review:

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 Dec 9, 2024

@shreyasiddhartha: This pull request references OSSM-8432 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 the "4.19.0" version, but no target version was set.

Details

In response to this:

Change type: Doc update; OSSM 2.6.4 (At Stage): Release Notes

Doc JIRA: https://issues.redhat.com/browse/OSSM-8432

Fix Version: 4.14+

Doc Preview: https://85846--ocpdocs-pr.netlify.app/openshift-enterprise/latest/service_mesh/v2x/servicemesh-release-notes#ossm-release-2-6-4_ossm-release-notes

SME Review:
QE Review: @unsortedhashsets
Peer Review:

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 Dec 9, 2024

@shreyasiddhartha: This pull request references OSSM-8432 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 the "4.19.0" version, but no target version was set.

Details

In response to this:

Change type: Doc update; OSSM 2.6.4 (At Stage): Release Notes

Doc JIRA: https://issues.redhat.com/browse/OSSM-8432

Fix Version: 4.14+

Doc Preview: https://85846--ocpdocs-pr.netlify.app/openshift-enterprise/latest/service_mesh/v2x/servicemesh-release-notes#ossm-release-2-6-4_ossm-release-notes

QE Review: @unsortedhashsets
Peer Review:

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.

@shreyasiddhartha
Copy link
Contributor Author

/label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Dec 9, 2024
@lahinson lahinson added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Dec 9, 2024
Copy link
Contributor

@lahinson lahinson left a comment

Choose a reason for hiding this comment

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

Looks good! Just a few minor items for your consideration.

@lahinson lahinson added peer-review-done Signifies that the peer review team has reviewed this PR and 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 Dec 9, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 9, 2024

@shreyasiddhartha: This pull request references OSSM-8432 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 the "4.19.0" version, but no target version was set.

Details

In response to this:

Change type: Doc update; OSSM 2.6.4 (At Stage): Release Notes

Doc JIRA: https://issues.redhat.com/browse/OSSM-8432

Fix Version: 4.14+

Doc Preview: https://85846--ocpdocs-pr.netlify.app/openshift-enterprise/latest/service_mesh/v2x/servicemesh-release-notes#ossm-release-2-6-4_ossm-release-notes

QE Review: @unsortedhashsets
Peer Review: @lahinson

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.

@shreyasiddhartha
Copy link
Contributor Author

/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 Dec 10, 2024
@openshift-ci
Copy link

openshift-ci bot commented Dec 10, 2024

@shreyasiddhartha: 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 added this to the Continuous Release milestone Dec 10, 2024
@ShaunaDiaz ShaunaDiaz added service-mesh Label for all Service Mesh PRs and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Dec 10, 2024
@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.17

@openshift-cherrypick-robot

@ShaunaDiaz: once the present PR merges, I will cherry-pick it on top of enterprise-4.17 in a new PR and assign it to you.

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.

@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@ShaunaDiaz: once the present PR merges, I will cherry-pick it on top of enterprise-4.16 in a new PR and assign it to you.

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 ShaunaDiaz merged commit a9e77ed into openshift:main Dec 10, 2024
@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.14

@openshift-cherrypick-robot

@ShaunaDiaz: new pull request created: #86042

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: new pull request created: #86043

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

@ShaunaDiaz: new pull request created: #86044

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: new pull request created: #86048

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

/cherrypick enterprise-4.13

@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.12

@openshift-cherrypick-robot

@ShaunaDiaz: #85846 failed to apply on top of branch "enterprise-4.13":

Applying: OSSM-8432
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
A	modules/ossm-release-2-6-3.adoc
M	service_mesh/v2x/servicemesh-release-notes.adoc
Falling back to patching base and 3-way merge...
Auto-merging service_mesh/v2x/servicemesh-release-notes.adoc
CONFLICT (content): Merge conflict in service_mesh/v2x/servicemesh-release-notes.adoc
CONFLICT (modify/delete): modules/ossm-release-2-6-3.adoc deleted in HEAD and modified in OSSM-8432. Version OSSM-8432 of modules/ossm-release-2-6-3.adoc left in tree.
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.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 OSSM-8432

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.

@openshift-cherrypick-robot

@ShaunaDiaz: #85846 failed to apply on top of branch "enterprise-4.12":

Applying: OSSM-8432
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
A	modules/ossm-release-2-6-3.adoc
M	service_mesh/v2x/servicemesh-release-notes.adoc
Falling back to patching base and 3-way merge...
Auto-merging service_mesh/v2x/servicemesh-release-notes.adoc
CONFLICT (content): Merge conflict in service_mesh/v2x/servicemesh-release-notes.adoc
CONFLICT (modify/delete): modules/ossm-release-2-6-3.adoc deleted in HEAD and modified in OSSM-8432. Version OSSM-8432 of modules/ossm-release-2-6-3.adoc left in tree.
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.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 OSSM-8432

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.

@ShaunaDiaz
Copy link
Contributor

ShaunaDiaz commented Dec 10, 2024

@ShaunaDiaz: #85846 failed to apply on top of branch "enterprise-4.13":

Applying: [OSSM-8432](https://issues.redhat.com//browse/OSSM-8432)
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
A	modules/ossm-release-2-6-3.adoc
M	service_mesh/v2x/servicemesh-release-notes.adoc
Falling back to patching base and 3-way merge...
Auto-merging service_mesh/v2x/servicemesh-release-notes.adoc
CONFLICT (content): Merge conflict in service_mesh/v2x/servicemesh-release-notes.adoc
CONFLICT (modify/delete): modules/ossm-release-2-6-3.adoc deleted in HEAD and modified in [OSSM-8432](https://issues.redhat.com//browse/OSSM-8432). Version [OSSM-8432](https://issues.redhat.com//browse/OSSM-8432) of modules/ossm-release-2-6-3.adoc left in tree.
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.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 [OSSM-8432](https://issues.redhat.com//browse/OSSM-8432)

@shreyasiddhartha Please do a manual CP for this one and 4.12.

@ShaunaDiaz
Copy link
Contributor

@shreyasiddhartha My understanding is that everything should go back to 4.12 with no skip branches. 4.10 is out of support and no longer updated.

@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.15

@openshift-cherrypick-robot

@ShaunaDiaz: new pull request created: #86050

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.

@shreyasiddhartha
Copy link
Contributor Author

@ShaunaDiaz In my PR, I have mentioned only 4.14+. I think that's already done. 4.10 was label was added by a peer reviewer, which isn't required for this PR. Anyway this PR cannot be applied before 4.14, as there were multiple changes to docs with no updates to the previous z-stream. IMHO, 4.14+ is enough.

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

Labels

branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. peer-review-done Signifies that the peer review team has reviewed this PR service-mesh Label for all Service Mesh PRs size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants