Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RHDEVDOCS-6046: Content creation for GitOps 1.10.5 RN #75486

Merged
merged 1 commit into from
May 13, 2024
Merged

RHDEVDOCS-6046: Content creation for GitOps 1.10.5 RN #75486

merged 1 commit into from
May 13, 2024

Conversation

Dhruv-Soni11
Copy link
Contributor

@Dhruv-Soni11 Dhruv-Soni11 commented May 3, 2024 •
edited

Version(s):

gitops-docs-1.10 , gitops-docs-1.11 , and gitops-docs-1.12

Issue:

https://issues.redhat.com/browse/RHDEVDOCS-6046

Link to docs preview:

https://75486--ocpdocs-pr.netlify.app/openshift-gitops/latest/release_notes/gitops-release-notes.html#release-notes-for-gitops-1-10-5_gitops-release-notes

SME review: Completed by @jgwest [ansingh@redhat.com] [anjoseph@redhat.com]
QE review: Completed by [skatyal@redhat.com)
Internal Peer review: Completed by @eromanova97
Peer review: Completed by @tmalove

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 3, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 3, 2024 •
edited by openshift-ci bot

@Dhruv-Soni11: This pull request references RHDEVDOCS-6046 which is a valid jira issue.

In response to this:

Version(s):

Issue:

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

ocpdocs-previewbot commented May 3, 2024 •
edited

🤖 Mon May 13 10:44:42 - Prow CI generated the docs preview:

https://75486--ocpdocs-pr.netlify.app/openshift-gitops/latest/release_notes/gitops-release-notes.html

@openshift-ci-robot
Copy link

openshift-ci-robot commented May 3, 2024 •
edited by openshift-ci bot

@Dhruv-Soni11: This pull request references RHDEVDOCS-6046 which is a valid jira issue.

In response to this:

Version(s):

GitOps 1.10

Issue:

https://issues.redhat.com/browse/RHDEVDOCS-6045

Link to docs preview:

https://75486--ocpdocs-pr.netlify.app/openshift-gitops/latest/release_notes/gitops-release-notes.html#release-notes-for-gitops-1-10-5_gitops-release-notes

SME review: @jgwest [ansingh@redhat.com] [anjoseph@redhat.com]
QE review: [skatyal@redhat.com)
Internal Peer review: @eromanova97
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.

@anandf
Copy link

anandf commented May 6, 2024

LGTM

eromanova97
eromanova97 reviewed May 6, 2024
View reviewed changes
Copy link
Contributor

@eromanova97 eromanova97 left a comment

Choose a reason for hiding this comment

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

@Dhruv-Soni11 I finished the review for these RNs entries and left some comments. Thank you!

modules/gitops-release-notes-1-10-5.adoc Outdated Show resolved Hide resolved
modules/gitops-release-notes-1-10-5.adoc Outdated Show resolved Hide resolved
modules/gitops-release-notes-1-10-5.adoc Outdated Show resolved Hide resolved
modules/gitops-release-notes-1-10-5.adoc Outdated Show resolved Hide resolved
modules/gitops-release-notes-1-10-5.adoc Outdated Show resolved Hide resolved
modules/gitops-release-notes-1-10-5.adoc Outdated Show resolved Hide resolved
@eromanova97
Copy link
Contributor

Oh, one more thing, I see that we include RNs for 1.10 in gitops 1.11 and 1.12 as well. So versions for cherry-picking should be:
gitops-docs-1.10 , gitops-docs-1.11 , and gitops-docs-1.12

@openshift-ci-robot
Copy link

openshift-ci-robot commented May 6, 2024 •
edited by openshift-ci bot

@Dhruv-Soni11: This pull request references RHDEVDOCS-6046 which is a valid jira issue.

In response to this:

Version(s):

gitops-docs-1.10 , gitops-docs-1.11 , and gitops-docs-1.12

Issue:

https://issues.redhat.com/browse/RHDEVDOCS-6045

Link to docs preview:

https://75486--ocpdocs-pr.netlify.app/openshift-gitops/latest/release_notes/gitops-release-notes.html#release-notes-for-gitops-1-10-5_gitops-release-notes

SME review: @jgwest [ansingh@redhat.com] [anjoseph@redhat.com]
QE review: [skatyal@redhat.com)
Internal Peer review: @eromanova97
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.

@anandrkskd
Copy link
Member

LGTM

@Dhruv-Soni11 Dhruv-Soni11 force-pushed the RHDEVDOCS-6046 branch 2 times, most recently from 5cfbec5 to 3f98ff3 Compare May 6, 2024 14:01
@Dhruv-Soni11
Copy link
Contributor Author

/retest

@Dhruv-Soni11
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 May 7, 2024
@tmalove
Copy link
Contributor

tmalove commented May 7, 2024

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

@openshift-ci openshift-ci bot added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels May 7, 2024
@tmalove
Copy link
Contributor

tmalove commented May 7, 2024

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

@openshift-ci openshift-ci bot 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 labels May 7, 2024
@Dhruv-Soni11 Dhruv-Soni11 changed the title RHDEVDOCS-6046: Content creation for GitOps 1.10.5 RN WIP: RHDEVDOCS-6046: Content creation for GitOps 1.10.5 RN May 10, 2024
@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 May 10, 2024
@Dhruv-Soni11
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 May 10, 2024
@Dhruv-Soni11 Dhruv-Soni11 changed the title WIP: RHDEVDOCS-6046: Content creation for GitOps 1.10.5 RN RHDEVDOCS-6046: Content creation for GitOps 1.10.5 RN May 13, 2024
@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 May 13, 2024
@Dhruv-Soni11
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 May 13, 2024
Srivaralakshmi
Srivaralakshmi reviewed May 13, 2024
View reviewed changes
Copy link
Member

@Srivaralakshmi Srivaralakshmi left a comment

Choose a reason for hiding this comment

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

@Dhruv-Soni11 PTAL at my suggestions and address them. Thank you!

modules/gitops-release-notes-1-10-5.adoc Outdated Show resolved Hide resolved
modules/gitops-release-notes-1-10-5.adoc Outdated Show resolved Hide resolved
@Srivaralakshmi Srivaralakshmi removed the merge-review-needed Signifies that the merge review team needs to review this PR label May 13, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented May 13, 2024

@Dhruv-Soni11: 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.

@Srivaralakshmi Srivaralakshmi added merge-review-needed Signifies that the merge review team needs to review this PR merge-review-in-progress Signifies that the merge review team is reviewing this PR gitops qe-approved Signifies that QE has signed off on this PR sme-review-done Service Delivery issues that have been reviewed by SRE, PMs, Engineering, QE, etc. and removed merge-review-needed Signifies that the merge review team needs to review this PR labels May 13, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 13, 2024 •
edited by openshift-ci bot

@Dhruv-Soni11: This pull request references RHDEVDOCS-6046 which is a valid jira issue.

In response to this:

Version(s):

gitops-docs-1.10 , gitops-docs-1.11 , and gitops-docs-1.12

Issue:

https://issues.redhat.com/browse/RHDEVDOCS-6045

Link to docs preview:

https://75486--ocpdocs-pr.netlify.app/openshift-gitops/latest/release_notes/gitops-release-notes.html#release-notes-for-gitops-1-10-5_gitops-release-notes

SME review: @jgwest [ansingh@redhat.com] [anjoseph@redhat.com]
QE review: [skatyal@redhat.com)
Internal Peer review: @eromanova97
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 May 13, 2024 •
edited by openshift-ci bot

@Dhruv-Soni11: This pull request references RHDEVDOCS-6046 which is a valid jira issue.

In response to this:

Version(s):

gitops-docs-1.10 , gitops-docs-1.11 , and gitops-docs-1.12

Issue:

https://issues.redhat.com/browse/RHDEVDOCS-6045

Link to docs preview:

https://75486--ocpdocs-pr.netlify.app/openshift-gitops/latest/release_notes/gitops-release-notes.html#release-notes-for-gitops-1-10-5_gitops-release-notes

SME review: Completed by @jgwest [ansingh@redhat.com] [anjoseph@redhat.com]
QE review: Completed by [skatyal@redhat.com)
Internal Peer review: Completed by @eromanova97
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 May 13, 2024 •
edited by openshift-ci bot

@Dhruv-Soni11: This pull request references RHDEVDOCS-6046 which is a valid jira issue.

In response to this:

Version(s):

gitops-docs-1.10 , gitops-docs-1.11 , and gitops-docs-1.12

Issue:

https://issues.redhat.com/browse/RHDEVDOCS-6045

Link to docs preview:

https://75486--ocpdocs-pr.netlify.app/openshift-gitops/latest/release_notes/gitops-release-notes.html#release-notes-for-gitops-1-10-5_gitops-release-notes

SME review: Completed by @jgwest [ansingh@redhat.com] [anjoseph@redhat.com]
QE review: Completed by [skatyal@redhat.com)
Internal Peer review: Completed by @eromanova97
Peer review: Completed by @tmalove

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.

@Srivaralakshmi Srivaralakshmi added this to the Continuous Release milestone May 13, 2024
@Srivaralakshmi Srivaralakshmi merged commit b6cb9ca into openshift:gitops-docs-main May 13, 2024
3 checks passed
@Srivaralakshmi
Copy link
Member

/cherrypick gitops-docs-1.10

@Srivaralakshmi
Copy link
Member

/cherrypick gitops-docs-1.11

@Srivaralakshmi
Copy link
Member

/cherrypick gitops-docs-1.12

@openshift-cherrypick-robot
Copy link

@Srivaralakshmi: #75486 failed to apply on top of branch "gitops-docs-1.10":

Applying: RHDEVDOCS-6046: Content creation for GitOps 1.10.5 RN
Using index info to reconstruct a base tree...
M	release_notes/gitops-release-notes.adoc
Falling back to patching base and 3-way merge...
Auto-merging release_notes/gitops-release-notes.adoc
CONFLICT (content): Merge conflict in release_notes/gitops-release-notes.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 RHDEVDOCS-6046: Content creation for GitOps 1.10.5 RN
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 gitops-docs-1.10

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
Copy link

@Srivaralakshmi: new pull request created: #75840

In response to this:

/cherrypick gitops-docs-1.11

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 openshift-cherrypick-robot mentioned this pull request May 13, 2024
Merged
@openshift-cherrypick-robot
Copy link

@Srivaralakshmi: new pull request created: #75841

In response to this:

/cherrypick gitops-docs-1.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.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request May 13, 2024
Merged
@Dhruv-Soni11 Dhruv-Soni11 mentioned this pull request May 13, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Srivaralakshmi Srivaralakshmi Srivaralakshmi left review comments

@eromanova97 eromanova97 eromanova97 left review comments

Assignees
No one assigned
Labels
gitops jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. merge-review-in-progress Signifies that the merge review team is reviewing this PR peer-review-done Signifies that the peer review team has reviewed this PR qe-approved Signifies that QE has signed off on this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files. sme-review-done Service Delivery issues that have been reviewed by SRE, PMs, Engineering, QE, etc.
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@Dhruv-Soni11 @openshift-ci-robot @ocpdocs-previewbot @anandf @eromanova97 @anandrkskd @tmalove @sheriff-rh @Srivaralakshmi @openshift-cherrypick-robot