CICD -Build, Pipelines and GitOps docs restructure by Preeticp · Pull Request #29252 · openshift/openshift-docs

Preeticp · 2021-02-08T16:43:56Z

Aligned team: DevTools
Applicable Version: 4.7
We have acks from respective team leads, and Stephanie and Vikram.

netlify · 2021-02-08T16:45:12Z

Deploy preview for osdocs ready!

Built with commit 85f4fe6

https://deploy-preview-29252--osdocs.netlify.app

minor edits move docs to cicd dir dir name mod modifying xref modifying xrefs fixing xrefs fixing xrefs fixing xrefs3 fix xrefs updating xrefs updating xrefs2 updating xrefs3 updating xrefs4 xref fixes updating module name

Preeticp · 2021-02-09T16:40:41Z

/devtools

jboxman · 2021-02-09T19:23:35Z

@Preeticp thanks for calling out labels!

jboxman · 2021-02-09T19:52:13Z

@Preeticp

I think this needs a symlink cicd/pipelines/images => ../../images.

asciidoctor: WARNING: image to embed not found or not readable: /Users/jasonb/Self/work/openshift-docs/cicd/pipelines/images/op-pipeline-builder.png
asciidoctor: WARNING: image to embed not found or not readable: /Users/jasonb/Self/work/openshift-docs/cicd/pipelines/images/op-pipeline-builder-task-details.png
asciidoctor: WARNING: image to embed not found or not readable: /Users/jasonb/Self/work/openshift-docs/cicd/pipelines/images/op-pipeline-list.png
asciidoctor: WARNING: image to embed not found or not readable: /Users/jasonb/Self/work/openshift-docs/cicd/pipelines/images/kebab.png
asciidoctor: WARNING: image to embed not found or not readable: /Users/jasonb/Self/work/openshift-docs/cicd/pipelines/images/kebab.png
asciidoctor: WARNING: image to embed not found or not readable: /Users/jasonb/Self/work/openshift-docs/cicd/pipelines/images/op_pipeline_run.png
asciidoctor: WARNING: image to embed not found or not readable: /Users/jasonb/Self/work/openshift-docs/cicd/pipelines/images/op_pipeline_topology.png
asciidoctor: WARNING: image to embed not found or not readable: /Users/jasonb/Self/work/openshift-docs/cicd/pipelines/images/kebab.png

jboxman

Looks like the symlink for images needs to be ../.. just like the xref adjustments.

jboxman · 2021-02-09T21:41:40Z

+    File: working-with-pipelines-using-the-developer-perspective
+  - Name: OpenShift Pipelines release notes
+    File: op-release-notes
+#- Name: GitOps


Do we want this added, commented out? Or should that happen in a different PR?

So we want to add this, and the entire reorg was initiated due to this component. But we don't have the content in place yet. Hence commented out. Is there a concern merging this commented out?
In the content PR we will add this with changes in the title as required, is that OK? This will come in slightly later, we spoke to Vikram and have an exception for this. Basically this component has an async release cycle from that of OCP.

jboxman · 2021-02-09T21:46:19Z

+* xref:../../cicd/builds/creating-build-inputs.adoc#builds-input-secrets-configmaps_creating-build-inputs[Input secrets and config maps]
 ifndef::openshift-origin[]
-* xref:../../architecture/cicd_gitops.adoc#cicd_gitops[The CI/CD methodology and practice]
+// **This section is being moved, update the link once content is in.* add link here[The CI/CD methodology and practice]


Remember to update this when the time is right.

We will add this with the content PR.

Preeticp · 2021-02-10T13:59:51Z

@jboxman I have fixed the images issue. The others we will fix with the content PR. Hope this is good to merge, if not let me know, please.

jboxman · 2021-02-10T17:26:31Z

@Preeticp, I squashed the commit in GitHub. (So if you delete the branch with git branch -d <branch> git will complain that the commit isn't merged, but in this case it is.)

jboxman · 2021-02-10T17:26:42Z

/cherry-pick enterprise-4.7

openshift-cherrypick-robot · 2021-02-10T17:27:21Z

@jboxman: #29252 failed to apply on top of branch "enterprise-4.7":

Applying: cicd restructure
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	applications/application_life_cycle_management/odc-creating-applications-using-developer-perspective.adoc
M	installing/install_config/customizations.adoc
Falling back to patching base and 3-way merge...
Auto-merging installing/install_config/customizations.adoc
CONFLICT (content): Merge conflict in cicd/pipelines/modules
CONFLICT (content): Merge conflict in cicd/pipelines/images
CONFLICT (content): Merge conflict in cicd/builds/modules
CONFLICT (content): Merge conflict in cicd/builds/images
Auto-merging applications/application_life_cycle_management/odc-creating-applications-using-developer-perspective.adoc
CONFLICT (content): Merge conflict in applications/application_life_cycle_management/odc-creating-applications-using-developer-perspective.adoc
Auto-merging _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 cicd restructure
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".

Details

In response to this:

/cherry-pick enterprise-4.7

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.

Preeticp · 2021-02-10T17:31:48Z

Thank you, @jboxman

jboxman · 2021-02-10T17:51:52Z

Fixing cherry-pick in another PR.

Restructure CI/CD content

[enterprise-4.7] CICD -Build, Pipelines and GitOps docs restructure (#29252)

openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 8, 2021

cicd restructure

1a297d4

minor edits move docs to cicd dir dir name mod modifying xref modifying xrefs fixing xrefs fixing xrefs fixing xrefs3 fix xrefs updating xrefs updating xrefs2 updating xrefs3 updating xrefs4 xref fixes updating module name

jboxman added dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs branch/enterprise-4.7 labels Feb 9, 2021

jboxman added this to the Future Release milestone Feb 9, 2021

jboxman reviewed Feb 9, 2021

View reviewed changes

jboxman added the peer-review-done Signifies that the peer review team has reviewed this PR label Feb 9, 2021

adding symlinks

85f4fe6

jboxman merged commit 5266187 into openshift:master Feb 10, 2021

jboxman mentioned this pull request Feb 10, 2021

[enterprise-4.7] CICD -Build, Pipelines and GitOps docs restructure (#29252) #29371

Merged

jboxman pushed a commit to jboxman-rh/openshift-docs that referenced this pull request Feb 10, 2021

CICD -Build, Pipelines and GitOps docs restructure (openshift#29252)

aa6aeee

Restructure CI/CD content

jboxman added a commit that referenced this pull request Feb 10, 2021

Merge pull request #29371 from jboxman/cicd-reorg-47

87fef85

[enterprise-4.7] CICD -Build, Pipelines and GitOps docs restructure (#29252)

vikram-redhat modified the milestones: Future Release, OCP 4.7 GA Feb 24, 2021

yuvalk mentioned this pull request Mar 18, 2021

cnf 4.6 references #30640

Closed

Conversation

Preeticp commented Feb 8, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

netlify Bot commented Feb 8, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Preeticp commented Feb 9, 2021

Uh oh!

jboxman commented Feb 9, 2021

Uh oh!

jboxman commented Feb 9, 2021

Uh oh!

jboxman left a comment

Choose a reason for hiding this comment

Uh oh!

jboxman Feb 9, 2021

Choose a reason for hiding this comment

Uh oh!

Preeticp Feb 10, 2021

Choose a reason for hiding this comment

Uh oh!

jboxman Feb 10, 2021

Choose a reason for hiding this comment

Uh oh!

jboxman Feb 9, 2021

Choose a reason for hiding this comment

Uh oh!

Preeticp Feb 10, 2021

Choose a reason for hiding this comment

Uh oh!

Preeticp commented Feb 10, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jboxman commented Feb 10, 2021

Uh oh!

jboxman commented Feb 10, 2021

Uh oh!

openshift-cherrypick-robot commented Feb 10, 2021

Uh oh!

Preeticp commented Feb 10, 2021

Uh oh!

jboxman commented Feb 10, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Preeticp commented Feb 8, 2021 •

edited

Loading

netlify Bot commented Feb 8, 2021 •

edited

Loading

Preeticp commented Feb 10, 2021 •

edited

Loading