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

Sample rhdevdocs 3866 #54197

Merged
merged 1 commit into from
Jan 12, 2023
Merged

Sample rhdevdocs 3866 #54197

merged 1 commit into from
Jan 12, 2023

Conversation

shreyasiddhartha
Copy link
Contributor

@shreyasiddhartha shreyasiddhartha commented Jan 4, 2023 •
edited

RHDEVDOCS-3866: Doc updates-Update Developer Perspective content based on recognized user/Merging the accessing perspectives sections
OpenShift 4.11 Freeze
JIRA issues: RHDEVDOCS-3866

SME Review: @jerolimov
QE Review: @sanketpathak
Peer Review: @rh-tokeefe

Doc Preview: https://54197--docspreview.netlify.app/openshift-enterprise/latest/web_console/web-console-overview.html

Note: Created sample branch because the changes were not getting updated in the old PR.
Old PR Link: #52924

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 4, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jan 4, 2023 •
edited

🤖 Updated build preview is available at:
https://54197--docspreview.netlify.app

Build log: https://circleci.com/gh/ocpdocs-previewbot/openshift-docs/6308

jerolimov
jerolimov reviewed Jan 5, 2023
View reviewed changes
modules/odc-accessing-developer-perspective.adoc
. Use the perspective switcher to switch to the *Developer* perspective. The *Topology* view with a list of all the projects in your cluster is displayed.
+
.Developer perspective
image::web_console_perspectives.png[The administrator and developer perspectives in the {product-title} web console.]
Copy link
Member

@jerolimov jerolimov Jan 5, 2023 •
edited

Choose a reason for hiding this comment

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

@shreyasiddhartha, you don't want show this image anymore? If this is by intention, then this PR lgtm.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @jerolimov. Yes, we decided to remove this image as other similar sections did not have such images. This was removed just to maintain consistency.

jerolimov
jerolimov approved these changes Jan 10, 2023
View reviewed changes
Copy link
Member

@jerolimov jerolimov left a comment

Choose a reason for hiding this comment

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

Lgtm!

@rolfedh rolfedh merged commit bd485c0 into openshift:main Jan 12, 2023
@rolfedh
Copy link
Contributor

rolfedh commented Jan 12, 2023

/cherry-pick enterprise-4.11

@rolfedh
Copy link
Contributor

rolfedh commented Jan 12, 2023

/cherry-pick enterprise-4.12

@rolfedh rolfedh added peer-review-done Signifies that the peer review team has reviewed this PR dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs qe-approved Signifies that QE has signed off on this PR branch/enterprise-4.11 branch/enterprise-4.12 labels Jan 12, 2023
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 12, 2023
Merged
@openshift-cherrypick-robot
Copy link

@rolfedh: new pull request created: #54579

In response to this:

/cherry-pick enterprise-4.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/test-infra repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 12, 2023
Merged
@openshift-cherrypick-robot
Copy link

@rolfedh: new pull request created: #54580

In response to this:

/cherry-pick 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/test-infra repository.

@rolfedh
Copy link
Contributor

rolfedh commented Jan 24, 2023

/cherry-pick enterprise-4.9

@cbremble
Copy link

Per this conversation: https://redhat-internal.slack.com/archives/GR18314R3/p1674584906201279?thread_ts=1673531450.095519&cid=GR18314R3 this should also go to 4.9 and 4.10.

@rolfedh
Copy link
Contributor

rolfedh commented Jan 24, 2023

/cherry-pick enterprise-4.10

@openshift-cherrypick-robot
Copy link

@rolfedh: #54197 failed to apply on top of branch "enterprise-4.9":

Applying: RHDEVDOCS-3866 Merging the accessing perspectives sections
Using index info to reconstruct a base tree...
M	modules/odc-accessing-developer-perspective.adoc
M	web_console/web-console-overview.adoc
Falling back to patching base and 3-way merge...
Auto-merging web_console/web-console-overview.adoc
CONFLICT (modify/delete): modules/odc-accessing-developer-perspective.adoc deleted in RHDEVDOCS-3866 Merging the accessing perspectives sections and modified in HEAD. Version HEAD of modules/odc-accessing-developer-perspective.adoc left in tree.
Removing modules/accessing-the-administrator-perspective.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-3866 Merging the accessing perspectives sections
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:

/cherry-pick enterprise-4.9

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/test-infra repository.

@openshift-cherrypick-robot
Copy link

@rolfedh: #54197 failed to apply on top of branch "enterprise-4.10":

Applying: RHDEVDOCS-3866 Merging the accessing perspectives sections
Using index info to reconstruct a base tree...
M	modules/odc-accessing-developer-perspective.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/odc-accessing-developer-perspective.adoc deleted in RHDEVDOCS-3866 Merging the accessing perspectives sections and modified in HEAD. Version HEAD of modules/odc-accessing-developer-perspective.adoc left in tree.
Removing modules/accessing-the-administrator-perspective.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-3866 Merging the accessing perspectives sections
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:

/cherry-pick enterprise-4.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/test-infra repository.

@rolfedh
Copy link
Contributor

rolfedh commented Jan 24, 2023

@shreyasiddhartha: In case you see this first, the two preceding cherry-pick attempts failed because there is a merge issue. To resolve these merge issues, please perform two manual cherry-pick operations, one for each branch, by using the instructions mentioned in the related Slack thread.

@shreyasiddhartha
Copy link
Contributor Author

/cherry-pick enterprise-4.9

@openshift-cherrypick-robot
Copy link

@shreyasiddhartha: only openshift org members may request cherry picks. You can still do the cherry-pick manually.

In response to this:

/cherry-pick enterprise-4.9

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/test-infra repository.

This was referenced Jan 25, 2023
Merged
Merged
rolfedh added a commit that referenced this pull request Jan 25, 2023
@rolfedh
Merge pull request #55157 from shreyasiddhartha/manual-cp-54197-to-4.10
c1bc424 
[enterprise 4.10]: Manual CP from #54197 to 4.10
rolfedh added a commit that referenced this pull request Jan 25, 2023
@rolfedh
Merge pull request #55156 from shreyasiddhartha/manual-cp-54197-to-4.…
54b28b8 
…9-new

[enterprise 4.9]: Manual CP from #54197 to 4.9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jerolimov jerolimov jerolimov approved these changes

Assignees
No one assigned
Labels
branch/enterprise-4.11 branch/enterprise-4.12 dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@shreyasiddhartha @ocpdocs-previewbot @rolfedh @openshift-cherrypick-robot @cbremble @jerolimov