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-5518: Documenting Pipelines templates in the admin console #62463

Merged
merged 1 commit into from Sep 5, 2023
Merged

RHDEVDOCS-5518: Documenting Pipelines templates in the admin console #62463

merged 1 commit into from Sep 5, 2023

Conversation

abrennan89
Copy link
Contributor

@abrennan89 abrennan89 commented Jul 17, 2023 •
edited

Version(s):
4.10+

Issue:
https://issues.redhat.com/browse/RHDEVDOCS-5518

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

  • Updated name of the assembly and structure so that it refers to "web console" at the top level instead of "Developer perspective", and can include content for both Developer and Administrator perspectives until restructuring work is completed by @mramendi
  • Removed old, outdated content
  • CC @Preeticp

@abrennan89 abrennan89 added peer-review-needed Signifies that the peer review team needs to review this PR dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 labels Jul 17, 2023
@abrennan89 abrennan89 added this to the Continuous Release milestone Jul 17, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 17, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 17, 2023 •
edited by openshift-ci bot

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

In response to this:

Version(s):
4.10+

Issue:
https://issues.redhat.com/browse/RHDEVDOCS-5518

Link to docs preview:
TBA

QE review:

  • QE has approved this change.

Additional information:

  • Updated name of the module and structure so that it refers to "web console" at the top level instead of "Developer perspective", and can include content for both Developer and Administrator perspectives until restructuring work is completed by @mramendi
  • CC @Preeticp

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 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/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 17, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 17, 2023 •
edited by openshift-ci bot

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

In response to this:

Version(s):
4.10+

Issue:
https://issues.redhat.com/browse/RHDEVDOCS-5518

Link to docs preview:
TBA

QE review:

  • QE has approved this change.

Additional information:

  • Updated name of the assembly and structure so that it refers to "web console" at the top level instead of "Developer perspective", and can include content for both Developer and Administrator perspectives until restructuring work is completed by @mramendi
  • CC @Preeticp

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.

@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jul 17, 2023 •
edited

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

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

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 17, 2023 •
edited by openshift-ci bot

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

In response to this:

Version(s):
4.10+

Issue:
https://issues.redhat.com/browse/RHDEVDOCS-5518

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

  • Updated name of the assembly and structure so that it refers to "web console" at the top level instead of "Developer perspective", and can include content for both Developer and Administrator perspectives until restructuring work is completed by @mramendi
  • CC @Preeticp

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-5518 branch 2 times, most recently from 738f95b to 8eb35bb Compare July 17, 2023 19:48
@abrennan89 abrennan89 changed the title [WIP] RHDEVDOCS-5518: Documenting Pipelines templates in the admin console RHDEVDOCS-5518: Documenting Pipelines templates in the admin console Jul 18, 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 Jul 18, 2023
@abrennan89 abrennan89 added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Jul 18, 2023
@abrennan89 abrennan89 force-pushed the RHDEVDOCS-5518 branch 2 times, most recently from 1d2bd7c to e7fb045 Compare July 18, 2023 16:34
@abrennan89 abrennan89 removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 18, 2023
@karthikjeeyar
Copy link

LGTM!

@sanketpathak
Copy link

QE Approved!

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 24, 2023 •
edited by openshift-ci bot

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

In response to this:

Version(s):
4.10+

Issue:
https://issues.redhat.com/browse/RHDEVDOCS-5518

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

  • Updated name of the assembly and structure so that it refers to "web console" at the top level instead of "Developer perspective", and can include content for both Developer and Administrator perspectives until restructuring work is completed by @mramendi
  • CC @Preeticp

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-5518 branch 2 times, most recently from 57769ff to 809578b Compare July 24, 2023 18:00
@openshift-cherrypick-robot
Copy link

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

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.

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.14

@openshift-cherrypick-robot
Copy link

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

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.

@abrennan89
Copy link
Contributor Author

/cherrypick pipelines-docs

@openshift-cherrypick-robot
Copy link

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

In response to this:

/cherrypick pipelines-docs

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

/cherrypick pipelines-docs-1.10

@openshift-cherrypick-robot
Copy link

@abrennan89: once the present PR merges, I will cherry-pick it on top of pipelines-docs-1.10 in a new PR and assign it to you.

In response to this:

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

@abrennan89
Copy link
Contributor Author

/cherrypick pipelines-docs-1.11

@openshift-cherrypick-robot
Copy link

@abrennan89: once the present PR merges, I will cherry-pick it on top of pipelines-docs-1.11 in a new PR and assign it to you.

In response to this:

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

@abrennan89
Copy link
Contributor Author

/cherrypick pipelines-docs-1.12

@openshift-cherrypick-robot
Copy link

@abrennan89: once the present PR merges, I will cherry-pick it on top of pipelines-docs-1.12 in a new PR and assign it to you.

In response to this:

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

@abrennan89 abrennan89 merged commit 6d6036c into openshift:main Sep 5, 2023
1 check passed
@openshift-cherrypick-robot
Copy link

@abrennan89: new pull request created: #64312

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 openshift-cherrypick-robot mentioned this pull request Sep 5, 2023
Merged
@openshift-cherrypick-robot
Copy link

@abrennan89: new pull request created: #64313

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 openshift-cherrypick-robot mentioned this pull request Sep 5, 2023
Merged
@openshift-cherrypick-robot
Copy link

@abrennan89: #62463 failed to apply on top of branch "pipelines-docs":

Applying: RHDEVDOCS-5518: Documenting Pipelines templates in the admin console
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
A	cicd/pipelines/creating-applications-with-cicd-pipelines.adoc
A	cicd/pipelines/customizing-configurations-in-the-tektonconfig-cr.adoc
A	cicd/pipelines/working-with-pipelines-using-the-developer-perspective.adoc
M	modules/op-constructing-pipelines-using-pipeline-builder.adoc
M	modules/op-creating-pipelines-along-with-applications.adoc
M	modules/op-deleting-pipelines.adoc
M	modules/op-editing-pipelines.adoc
M	modules/op-interacting-pipelines-from-topology-view.adoc
M	modules/op-interacting-with-pipelines-using-the-developer-perspective.adoc
M	modules/op-starting-pipelines-from-pipelines-view.adoc
M	modules/op-starting-pipelines-from-topology-view.adoc
M	modules/op-using-custom-pipeline-template-for-git-import.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/op-using-custom-pipeline-template-for-git-import.adoc deleted in RHDEVDOCS-5518: Documenting Pipelines templates in the admin console and modified in HEAD. Version HEAD of modules/op-using-custom-pipeline-template-for-git-import.adoc left in tree.
Auto-merging modules/op-starting-pipelines-from-topology-view.adoc
CONFLICT (content): Merge conflict in modules/op-starting-pipelines-from-topology-view.adoc
Auto-merging modules/op-starting-pipelines-from-pipelines-view.adoc
CONFLICT (content): Merge conflict in modules/op-starting-pipelines-from-pipelines-view.adoc
Auto-merging modules/op-interacting-with-pipelines-using-the-developer-perspective.adoc
CONFLICT (content): Merge conflict in modules/op-interacting-with-pipelines-using-the-developer-perspective.adoc
Auto-merging modules/op-interacting-pipelines-from-topology-view.adoc
CONFLICT (content): Merge conflict in modules/op-interacting-pipelines-from-topology-view.adoc
Auto-merging modules/op-editing-pipelines.adoc
CONFLICT (content): Merge conflict in modules/op-editing-pipelines.adoc
Auto-merging modules/op-deleting-pipelines.adoc
CONFLICT (content): Merge conflict in modules/op-deleting-pipelines.adoc
Auto-merging modules/op-creating-pipelines-along-with-applications.adoc
CONFLICT (content): Merge conflict in modules/op-creating-pipelines-along-with-applications.adoc
Auto-merging modules/op-constructing-pipelines-using-pipeline-builder.adoc
CONFLICT (content): Merge conflict in modules/op-constructing-pipelines-using-pipeline-builder.adoc
Auto-merging install_config/customizing-configurations-in-the-tektonconfig-cr.adoc
CONFLICT (content): Merge conflict in install_config/customizing-configurations-in-the-tektonconfig-cr.adoc
CONFLICT (rename/delete): cicd/pipelines/working-with-pipelines-using-the-developer-perspective.adoc deleted in RHDEVDOCS-5518: Documenting Pipelines templates in the admin console and renamed to create/working-with-pipelines-using-the-developer-perspective.adoc in HEAD. Version HEAD of create/working-with-pipelines-using-the-developer-perspective.adoc left in tree.
Auto-merging create/creating-applications-with-cicd-pipelines.adoc
CONFLICT (content): Merge conflict in create/creating-applications-with-cicd-pipelines.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
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-5518: Documenting Pipelines templates in the admin console
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 pipelines-docs

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: #62463 failed to apply on top of branch "pipelines-docs-1.12":

Applying: RHDEVDOCS-5518: Documenting Pipelines templates in the admin console
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
A	cicd/pipelines/creating-applications-with-cicd-pipelines.adoc
A	cicd/pipelines/customizing-configurations-in-the-tektonconfig-cr.adoc
A	cicd/pipelines/working-with-pipelines-using-the-developer-perspective.adoc
M	modules/op-constructing-pipelines-using-pipeline-builder.adoc
M	modules/op-creating-pipelines-along-with-applications.adoc
M	modules/op-deleting-pipelines.adoc
M	modules/op-editing-pipelines.adoc
M	modules/op-interacting-pipelines-from-topology-view.adoc
M	modules/op-interacting-with-pipelines-using-the-developer-perspective.adoc
M	modules/op-starting-pipelines-from-pipelines-view.adoc
M	modules/op-starting-pipelines-from-topology-view.adoc
M	modules/op-using-custom-pipeline-template-for-git-import.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/op-using-custom-pipeline-template-for-git-import.adoc deleted in RHDEVDOCS-5518: Documenting Pipelines templates in the admin console and modified in HEAD. Version HEAD of modules/op-using-custom-pipeline-template-for-git-import.adoc left in tree.
Auto-merging modules/op-starting-pipelines-from-topology-view.adoc
CONFLICT (content): Merge conflict in modules/op-starting-pipelines-from-topology-view.adoc
Auto-merging modules/op-starting-pipelines-from-pipelines-view.adoc
CONFLICT (content): Merge conflict in modules/op-starting-pipelines-from-pipelines-view.adoc
Auto-merging modules/op-interacting-with-pipelines-using-the-developer-perspective.adoc
CONFLICT (content): Merge conflict in modules/op-interacting-with-pipelines-using-the-developer-perspective.adoc
Auto-merging modules/op-interacting-pipelines-from-topology-view.adoc
CONFLICT (content): Merge conflict in modules/op-interacting-pipelines-from-topology-view.adoc
Auto-merging modules/op-editing-pipelines.adoc
CONFLICT (content): Merge conflict in modules/op-editing-pipelines.adoc
Auto-merging modules/op-deleting-pipelines.adoc
CONFLICT (content): Merge conflict in modules/op-deleting-pipelines.adoc
Auto-merging modules/op-creating-pipelines-along-with-applications.adoc
CONFLICT (content): Merge conflict in modules/op-creating-pipelines-along-with-applications.adoc
Auto-merging modules/op-constructing-pipelines-using-pipeline-builder.adoc
CONFLICT (content): Merge conflict in modules/op-constructing-pipelines-using-pipeline-builder.adoc
Auto-merging install_config/customizing-configurations-in-the-tektonconfig-cr.adoc
CONFLICT (content): Merge conflict in install_config/customizing-configurations-in-the-tektonconfig-cr.adoc
CONFLICT (rename/delete): cicd/pipelines/working-with-pipelines-using-the-developer-perspective.adoc deleted in RHDEVDOCS-5518: Documenting Pipelines templates in the admin console and renamed to create/working-with-pipelines-using-the-developer-perspective.adoc in HEAD. Version HEAD of create/working-with-pipelines-using-the-developer-perspective.adoc left in tree.
Auto-merging create/creating-applications-with-cicd-pipelines.adoc
CONFLICT (content): Merge conflict in create/creating-applications-with-cicd-pipelines.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
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-5518: Documenting Pipelines templates in the admin console
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 pipelines-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/test-infra repository.

@openshift-cherrypick-robot
Copy link

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

Applying: RHDEVDOCS-5518: Documenting Pipelines templates in the admin console
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	cicd/pipelines/creating-applications-with-cicd-pipelines.adoc
M	cicd/pipelines/customizing-configurations-in-the-tektonconfig-cr.adoc
M	cicd/pipelines/working-with-pipelines-using-the-developer-perspective.adoc
M	modules/op-constructing-pipelines-using-pipeline-builder.adoc
A	modules/op-creating-pipelines-along-with-applications.adoc
M	modules/op-deleting-pipelines.adoc
M	modules/op-editing-pipelines.adoc
M	modules/op-interacting-with-pipelines-using-the-developer-perspective.adoc
M	modules/op-starting-pipelines-from-pipelines-view.adoc
M	modules/op-starting-pipelines-from-topology-view.adoc
M	modules/op-using-custom-pipeline-template-for-git-import.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/op-using-custom-pipeline-template-for-git-import.adoc deleted in RHDEVDOCS-5518: Documenting Pipelines templates in the admin console and modified in HEAD. Version HEAD of modules/op-using-custom-pipeline-template-for-git-import.adoc left in tree.
Auto-merging modules/op-starting-pipelines-from-topology-view.adoc
Auto-merging modules/op-starting-pipelines-from-pipelines-view.adoc
Auto-merging modules/op-interacting-with-pipelines-using-the-developer-perspective.adoc
Auto-merging modules/op-editing-pipelines.adoc
Auto-merging modules/op-deleting-pipelines.adoc
CONFLICT (modify/delete): modules/op-creating-pipelines-along-with-applications.adoc deleted in HEAD and modified in RHDEVDOCS-5518: Documenting Pipelines templates in the admin console. Version RHDEVDOCS-5518: Documenting Pipelines templates in the admin console of modules/op-creating-pipelines-along-with-applications.adoc left in tree.
Auto-merging modules/op-constructing-pipelines-using-pipeline-builder.adoc
CONFLICT (modify/delete): cicd/pipelines/working-with-pipelines-using-the-developer-perspective.adoc deleted in RHDEVDOCS-5518: Documenting Pipelines templates in the admin console and modified in HEAD. Version HEAD of cicd/pipelines/working-with-pipelines-using-the-developer-perspective.adoc left in tree.
Auto-merging cicd/pipelines/customizing-configurations-in-the-tektonconfig-cr.adoc
Auto-merging cicd/pipelines/creating-applications-with-cicd-pipelines.adoc
CONFLICT (content): Merge conflict in cicd/pipelines/creating-applications-with-cicd-pipelines.adoc
Auto-merging _topic_maps/_topic_map.yml
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-5518: Documenting Pipelines templates in the admin console
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: new pull request created: #64314

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 Sep 5, 2023
Merged
@openshift-cherrypick-robot
Copy link

@abrennan89: #62463 failed to apply on top of branch "pipelines-docs-1.10":

Applying: RHDEVDOCS-5518: Documenting Pipelines templates in the admin console
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
A	cicd/pipelines/creating-applications-with-cicd-pipelines.adoc
A	cicd/pipelines/customizing-configurations-in-the-tektonconfig-cr.adoc
A	cicd/pipelines/working-with-pipelines-using-the-developer-perspective.adoc
M	modules/op-constructing-pipelines-using-pipeline-builder.adoc
M	modules/op-creating-pipelines-along-with-applications.adoc
M	modules/op-deleting-pipelines.adoc
M	modules/op-editing-pipelines.adoc
M	modules/op-interacting-pipelines-from-topology-view.adoc
M	modules/op-interacting-with-pipelines-using-the-developer-perspective.adoc
M	modules/op-starting-pipelines-from-pipelines-view.adoc
M	modules/op-starting-pipelines-from-topology-view.adoc
M	modules/op-using-custom-pipeline-template-for-git-import.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/op-using-custom-pipeline-template-for-git-import.adoc deleted in RHDEVDOCS-5518: Documenting Pipelines templates in the admin console and modified in HEAD. Version HEAD of modules/op-using-custom-pipeline-template-for-git-import.adoc left in tree.
Auto-merging modules/op-starting-pipelines-from-topology-view.adoc
CONFLICT (content): Merge conflict in modules/op-starting-pipelines-from-topology-view.adoc
Auto-merging modules/op-starting-pipelines-from-pipelines-view.adoc
CONFLICT (content): Merge conflict in modules/op-starting-pipelines-from-pipelines-view.adoc
Auto-merging modules/op-interacting-with-pipelines-using-the-developer-perspective.adoc
CONFLICT (content): Merge conflict in modules/op-interacting-with-pipelines-using-the-developer-perspective.adoc
Auto-merging modules/op-interacting-pipelines-from-topology-view.adoc
CONFLICT (content): Merge conflict in modules/op-interacting-pipelines-from-topology-view.adoc
Auto-merging modules/op-editing-pipelines.adoc
CONFLICT (content): Merge conflict in modules/op-editing-pipelines.adoc
Auto-merging modules/op-deleting-pipelines.adoc
CONFLICT (content): Merge conflict in modules/op-deleting-pipelines.adoc
Auto-merging modules/op-creating-pipelines-along-with-applications.adoc
CONFLICT (content): Merge conflict in modules/op-creating-pipelines-along-with-applications.adoc
Auto-merging modules/op-constructing-pipelines-using-pipeline-builder.adoc
CONFLICT (content): Merge conflict in modules/op-constructing-pipelines-using-pipeline-builder.adoc
Auto-merging install_config/customizing-configurations-in-the-tektonconfig-cr.adoc
CONFLICT (content): Merge conflict in install_config/customizing-configurations-in-the-tektonconfig-cr.adoc
CONFLICT (rename/delete): cicd/pipelines/working-with-pipelines-using-the-developer-perspective.adoc deleted in RHDEVDOCS-5518: Documenting Pipelines templates in the admin console and renamed to create/working-with-pipelines-using-the-developer-perspective.adoc in HEAD. Version HEAD of create/working-with-pipelines-using-the-developer-perspective.adoc left in tree.
Auto-merging create/creating-applications-with-cicd-pipelines.adoc
CONFLICT (content): Merge conflict in create/creating-applications-with-cicd-pipelines.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
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-5518: Documenting Pipelines templates in the admin console
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 pipelines-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/test-infra repository.

@openshift-cherrypick-robot
Copy link

@abrennan89: #62463 failed to apply on top of branch "pipelines-docs-1.11":

Applying: RHDEVDOCS-5518: Documenting Pipelines templates in the admin console
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
A	cicd/pipelines/creating-applications-with-cicd-pipelines.adoc
A	cicd/pipelines/customizing-configurations-in-the-tektonconfig-cr.adoc
A	cicd/pipelines/working-with-pipelines-using-the-developer-perspective.adoc
M	modules/op-constructing-pipelines-using-pipeline-builder.adoc
M	modules/op-creating-pipelines-along-with-applications.adoc
M	modules/op-deleting-pipelines.adoc
M	modules/op-editing-pipelines.adoc
M	modules/op-interacting-pipelines-from-topology-view.adoc
M	modules/op-interacting-with-pipelines-using-the-developer-perspective.adoc
M	modules/op-starting-pipelines-from-pipelines-view.adoc
M	modules/op-starting-pipelines-from-topology-view.adoc
M	modules/op-using-custom-pipeline-template-for-git-import.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/op-using-custom-pipeline-template-for-git-import.adoc deleted in RHDEVDOCS-5518: Documenting Pipelines templates in the admin console and modified in HEAD. Version HEAD of modules/op-using-custom-pipeline-template-for-git-import.adoc left in tree.
Auto-merging modules/op-starting-pipelines-from-topology-view.adoc
CONFLICT (content): Merge conflict in modules/op-starting-pipelines-from-topology-view.adoc
Auto-merging modules/op-starting-pipelines-from-pipelines-view.adoc
CONFLICT (content): Merge conflict in modules/op-starting-pipelines-from-pipelines-view.adoc
Auto-merging modules/op-interacting-with-pipelines-using-the-developer-perspective.adoc
CONFLICT (content): Merge conflict in modules/op-interacting-with-pipelines-using-the-developer-perspective.adoc
Auto-merging modules/op-interacting-pipelines-from-topology-view.adoc
CONFLICT (content): Merge conflict in modules/op-interacting-pipelines-from-topology-view.adoc
Auto-merging modules/op-editing-pipelines.adoc
CONFLICT (content): Merge conflict in modules/op-editing-pipelines.adoc
Auto-merging modules/op-deleting-pipelines.adoc
CONFLICT (content): Merge conflict in modules/op-deleting-pipelines.adoc
Auto-merging modules/op-creating-pipelines-along-with-applications.adoc
CONFLICT (content): Merge conflict in modules/op-creating-pipelines-along-with-applications.adoc
Auto-merging modules/op-constructing-pipelines-using-pipeline-builder.adoc
CONFLICT (content): Merge conflict in modules/op-constructing-pipelines-using-pipeline-builder.adoc
Auto-merging install_config/customizing-configurations-in-the-tektonconfig-cr.adoc
CONFLICT (content): Merge conflict in install_config/customizing-configurations-in-the-tektonconfig-cr.adoc
CONFLICT (rename/delete): cicd/pipelines/working-with-pipelines-using-the-developer-perspective.adoc deleted in RHDEVDOCS-5518: Documenting Pipelines templates in the admin console and renamed to create/working-with-pipelines-using-the-developer-perspective.adoc in HEAD. Version HEAD of create/working-with-pipelines-using-the-developer-perspective.adoc left in tree.
Auto-merging create/creating-applications-with-cicd-pipelines.adoc
CONFLICT (content): Merge conflict in create/creating-applications-with-cicd-pipelines.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
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-5518: Documenting Pipelines templates in the admin console
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 pipelines-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/test-infra repository.

@openshift-cherrypick-robot
Copy link

@abrennan89: new pull request created: #64315

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 openshift-cherrypick-robot mentioned this pull request Sep 5, 2023
Merged
@abrennan89 abrennan89 mentioned this pull request Sep 5, 2023
Merged
@abrennan89
Copy link
Contributor Author

Pipelines docs cherrypicks followed up from #64318 instead of CPing directly from this branch to reduce conflicts

This was referenced Sep 5, 2023
Merged
Merged
@abrennan89 abrennan89 deleted the RHDEVDOCS-5518 branch September 18, 2023 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ppitonak ppitonak ppitonak approved these changes

@mramendi mramendi mramendi approved these changes

@vdemeester vdemeester Awaiting requested review from vdemeester

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-needed Signifies that the peer review team needs to review this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@abrennan89 @openshift-ci-robot @ocpdocs-previewbot @karthikjeeyar @sanketpathak @mramendi @ppitonak @openshift-cherrypick-robot @vdemeester