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-5391: Add Operator prerequisites to JAR upload docs #61308

Merged
merged 1 commit into from Jun 29, 2023
Merged

RHDEVDOCS-5391: Add Operator prerequisites to JAR upload docs #61308

merged 1 commit into from Jun 29, 2023

Conversation

abrennan89
Copy link
Contributor

@abrennan89 abrennan89 commented Jun 15, 2023 •
edited

@abrennan89 abrennan89 added this to the Continuous Release milestone Jun 15, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 15, 2023 •
edited by openshift-ci bot

@abrennan89: This pull request references RHDEVDOCS-5391 which is a valid jira issue.

In response to this:

Version(s):
4.10+

Issue:
https://issues.redhat.com/browse/RHDEVDOCS-5391
Related eng issue: https://issues.redhat.com/browse/OCPBUGS-15011

Link to docs preview:
TBA

QE review:

  • QE has approved this change.

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-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 15, 2023
@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 15, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jun 15, 2023 •
edited

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

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

@abrennan89 abrennan89 changed the title [WIP] RHDEVDOCS-5391: Add Operator prerequisites to JAR upload docs RHDEVDOCS-5391: Add Operator prerequisites to JAR upload docs Jun 16, 2023
@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 Jun 16, 2023
@abrennan89 abrennan89 added the peer-review-needed Signifies that the peer review team needs to review this PR label Jun 16, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 16, 2023 •
edited by openshift-ci bot

@abrennan89: This pull request references RHDEVDOCS-5391 which is a valid jira issue.

In response to this:

Version(s):
4.10+

Issue:
https://issues.redhat.com/browse/RHDEVDOCS-5391
Related eng issue: https://issues.redhat.com/browse/OCPBUGS-15011

Link to docs preview:
https://61308--docspreview.netlify.app/openshift-enterprise/latest/applications/creating_applications/odc-creating-applications-using-developer-perspective.html#odc-deploying-java-applications_odc-creating-applications-using-developer-perspective

QE review:

  • QE has approved this change.

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.

@abrennan89 abrennan89 force-pushed the RHDEVDOCS-5391 branch 2 times, most recently from 0858ffa to 9474bf7 Compare June 22, 2023 16:35
jerolimov
jerolimov suggested changes Jun 22, 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.

Looks almost good. Just one detail we can cleanup here related to Advanced options -> Resource type:

modules/odc-deploying-java-applications.adoc Outdated Show resolved Hide resolved
@abrennan89 abrennan89 force-pushed the RHDEVDOCS-5391 branch 2 times, most recently from 43e32bc to 3817ade Compare June 27, 2023 14:22
@sanketpathak
Copy link

QE approved

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 27, 2023 •
edited by openshift-ci bot

@abrennan89: This pull request references RHDEVDOCS-5391 which is a valid jira issue.

In response to this:

Version(s):
4.10+

Issue:
https://issues.redhat.com/browse/RHDEVDOCS-5391
Related eng issue: https://issues.redhat.com/browse/OCPBUGS-15011

Link to docs preview:
https://61308--docspreview.netlify.app/openshift-enterprise/latest/applications/creating_applications/odc-creating-applications-using-developer-perspective.html#odc-deploying-java-applications_odc-creating-applications-using-developer-perspective

QE review:

  • QE has approved this change.

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.

eromanova97
eromanova97 reviewed Jun 28, 2023
View reviewed changes
modules/odc-deploying-java-applications.adoc Outdated Show resolved Hide resolved
modules/odc-deploying-java-applications.adoc Outdated Show resolved Hide resolved
modules/odc-deploying-java-applications.adoc Outdated Show resolved Hide resolved
modules/odc-deploying-java-applications.adoc Outdated Show resolved Hide resolved
modules/odc-deploying-java-applications.adoc Outdated Show resolved Hide resolved
modules/odc-deploying-java-applications.adoc Outdated Show resolved Hide resolved
@openshift-ci openshift-ci bot removed the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 28, 2023
@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 28, 2023
@abrennan89 abrennan89 added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Jun 28, 2023
@eromanova97
Copy link
Contributor

lgtm

@abrennan89 abrennan89 merged commit d4cc286 into openshift:main Jun 29, 2023
1 check passed
@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.10

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.11

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.12

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.13

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.14

@openshift-cherrypick-robot
Copy link

@abrennan89: #61308 failed to apply on top of branch "enterprise-4.10":

Applying: RHDEVDOCS-5391: Add Operator prerequisites to JAR upload docs
.git/rebase-apply/patch:56: trailing whitespace.
. Optional: Use the *Resource type* drop-down list to change the resource type. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	modules/odc-deploying-java-applications.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/odc-deploying-java-applications.adoc
CONFLICT (content): Merge conflict in modules/odc-deploying-java-applications.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-5391: Add Operator prerequisites to JAR upload docs
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.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.

@openshift-cherrypick-robot
Copy link

@abrennan89: #61308 failed to apply on top of branch "enterprise-4.11":

Applying: RHDEVDOCS-5391: Add Operator prerequisites to JAR upload docs
.git/rebase-apply/patch:56: trailing whitespace.
. Optional: Use the *Resource type* drop-down list to change the resource type. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	modules/odc-deploying-java-applications.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/odc-deploying-java-applications.adoc
CONFLICT (content): Merge conflict in modules/odc-deploying-java-applications.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-5391: Add Operator prerequisites to JAR upload docs
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.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
Copy link

@abrennan89: #61308 failed to apply on top of branch "enterprise-4.12":

Applying: RHDEVDOCS-5391: Add Operator prerequisites to JAR upload docs
.git/rebase-apply/patch:56: trailing whitespace.
. Optional: Use the *Resource type* drop-down list to change the resource type. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	modules/odc-deploying-java-applications.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/odc-deploying-java-applications.adoc
CONFLICT (content): Merge conflict in modules/odc-deploying-java-applications.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-5391: Add Operator prerequisites to JAR upload docs
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.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.

@openshift-cherrypick-robot
Copy link

@abrennan89: #61308 failed to apply on top of branch "enterprise-4.13":

Applying: RHDEVDOCS-5391: Add Operator prerequisites to JAR upload docs
.git/rebase-apply/patch:56: trailing whitespace.
. Optional: Use the *Resource type* drop-down list to change the resource type. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	modules/odc-deploying-java-applications.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/odc-deploying-java-applications.adoc
CONFLICT (content): Merge conflict in modules/odc-deploying-java-applications.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-5391: Add Operator prerequisites to JAR upload docs
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.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/test-infra repository.

@openshift-cherrypick-robot
Copy link

@abrennan89: new pull request created: #61910

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

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jun 29, 2023
Merged
This was referenced Jun 29, 2023
Merged
Merged
Merged
Merged
@abrennan89 abrennan89 deleted the RHDEVDOCS-5391 branch September 18, 2023 15:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eromanova97 eromanova97 eromanova97 left review comments

@jerolimov jerolimov jerolimov requested changes

Assignees
No one assigned
Labels
branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs 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 size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@abrennan89 @openshift-ci-robot @ocpdocs-previewbot @sanketpathak @eromanova97 @openshift-cherrypick-robot @jerolimov