From 2963ecebb03b42e35e31aa0bc806f8be0ef13ea6 Mon Sep 17 00:00:00 2001 From: Blaisonneau David Date: Mon, 27 Nov 2017 10:07:18 +0100 Subject: [PATCH] Add explanation how to use branches Add what is a GIT branch, and what are the best practices in an ONAP context Issue-ID: DOC-207 Change-Id: Ifcab27b13df4719b16c6c3df84c2caafe7864973 Signed-off-by: Blaisonneau David --- .../how-to-use-docs/git_branches.png | Bin 0 -> 35166 bytes .../how-to-use-docs/git_branches.svg | 620 +++++++++++++++++++++ .../how-to-use-docs/include-documentation.rst | 112 ++-- 3 files changed, 687 insertions(+), 45 deletions(-) create mode 100644 docs/guides/onap-developer/how-to-use-docs/git_branches.png create mode 100644 docs/guides/onap-developer/how-to-use-docs/git_branches.svg diff --git a/docs/guides/onap-developer/how-to-use-docs/git_branches.png b/docs/guides/onap-developer/how-to-use-docs/git_branches.png new file mode 100644 index 0000000000000000000000000000000000000000..00c6984510ec491574578ce290499509a38e9eac GIT binary patch literal 35166 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 literal 0 HcmV?d00001 diff --git a/docs/guides/onap-developer/how-to-use-docs/git_branches.svg b/docs/guides/onap-developer/how-to-use-docs/git_branches.svg new file mode 100644 index 000000000..faddef9cf --- /dev/null +++ b/docs/guides/onap-developer/how-to-use-docs/git_branches.svg @@ -0,0 +1,620 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + Master + + + + + + + + + + Feature1 + Feature2 + enhanced feature2 + + + + bugfix1 + + + feature3 + + + + bugfix2 + + + + + + + feature4 + + + + + stable/A + stable/B + Stable branch creation + + cherry pick bugfix2 + + Stable branch creation + + + =1 commit + merge branch 'feature1' + + to master branch + create branch + for 'feature1' + + + diff --git a/docs/guides/onap-developer/how-to-use-docs/include-documentation.rst b/docs/guides/onap-developer/how-to-use-docs/include-documentation.rst index 15d71d453..4e76f6149 100644 --- a/docs/guides/onap-developer/how-to-use-docs/include-documentation.rst +++ b/docs/guides/onap-developer/how-to-use-docs/include-documentation.rst @@ -6,7 +6,7 @@ Setting Up Some initial set up is required to connect a project with the master document structure and enable automated publishing of -changes as summarized in the following diagram and description below +changes as summarized in the following diagram and description below below. .. seqdiag:: @@ -19,9 +19,9 @@ below. DR [label = "Doc Gerrit Repo" , color=pink]; PR [label = "Other Project\nGerrit Repo", color=pink ]; PA [label = "Other Project\nAuthor/Committer", color=lightblue]; - + === One time setup doc project only === - RD -> DA [label = "Acquire Account" ]; + RD -> DA [label = "Acquire Account" ]; DA -> DR [label = "Create initial\n doc repository content"]; DA <<-- DR [label = "Merge" ]; RD <-- DA [label = "Connect gerrit.onap.org" ]; @@ -29,32 +29,32 @@ below. PA -> DR [label = "Add project repo as\ngit submodule" ]; DR -> DA [label = "Review & Plan to\nIntegrate Content with\nTocTree Structure" ]; DR <-- DA [label = "Vote +2/Merge" ]; - PA <-- DR [label = "Merge Notification" ]; + PA <-- DR [label = "Merge Notification" ]; PA -> PR [label = "Create in project repo\ntop level directory and index.rst" ]; PR -> DA [label = "Add as Reviewer" ]; PR <-- DA [label = "Approve and Integrate" ]; PA <-- PR [label = "Merge" ]; } - - + + Setup doc project ----------------- These steps are performed only once for the doc project and include: (1) creating in the doc repository an initial: - - sphinx master document index - - a directory structure aligned with the document structure - - tests performed in jenkins verify jobs - - sphinx configuration - + - sphinx master document index + - a directory structure aligned with the document structure + - tests performed in jenkins verify jobs + - sphinx configuration + (2) establishing an account at readthedocs connected with the doc doc project repo in gerrit.onap.org. Setup project repositories(s) ----------------------------- -These steps are performed for each project repository that provides documentation. +These steps are performed for each project repository that provides documentation. First let's set two variables that will be used in the subsequent steps. Set reponame to the project repository you are setting up just as it appears in the @@ -67,7 +67,7 @@ clone requests over ssh. reponame= lfid= -The next step is to add a directory in the doc project where your project will be included as a +The next step is to add a directory in the doc project where your project will be included as a submodule and at least one reference from the doc project to the documentation index in your repository. The following sequence will do this over ssh. @@ -75,7 +75,7 @@ The following sequence will do this over ssh. If your access network restricts ssh, you will need to use equivalent git commands and HTTP Passwords as described `here `_. - + .. code-block:: bash git clone ssh://$lfid@gerrit.onap.org:29418/doc @@ -86,11 +86,11 @@ The following sequence will do this over ssh. git submodule update docs/submodules/$reponame.git echo " $reponame <../submodules/$reponame.git/docs/index>" >> docs/release/repolist.rst - + git add . git commit -s git review - + .. caution:: Wait for the above change to be merged before any merge to the project repository that you have just added as a submodule. @@ -107,7 +107,7 @@ to convert or add new content you can update the index and add files under the d If you have additional content, you can include it by editing the index.rst file and/or adding other files before the git commit. See `Templates and Examples`_ below and :ref:`converting-to-rst` for more information. - + .. code-block:: bash @@ -120,13 +120,13 @@ to convert or add new content you can update the index and add files under the d ------------------------------------------------ .. toctree:: :maxdepth: 1 - + " > docs/index.rst - + git add . git commit -s git review - + The diagram below illustrates what is accomplished in the setup steps above from the perspective of a file structure created for a local test, @@ -134,14 +134,14 @@ a jenkins verify job, and/or published release documentation including: - ONAP gerrit project repositories, - doc project repository master document index.rst, templates, configuration, and other documents -- submodules directory where other project repositories and directories/files are referenced +- submodules directory where other project repositories and directories/files are referenced - file structure: directories (ellipses), files(boxes) - references: directory/files (solid edges), git submodule (dotted edges), sphinx toctree (dashed edges) .. graphviz:: - + digraph docstructure { size="8,12"; node [fontname = "helvetica"]; @@ -156,7 +156,7 @@ a jenkins verify job, and/or published release documentation including: gerrit -> doc; gerrit -> aaf; gerrit -> aai; - gerrit -> reponame; + gerrit -> reponame; gerrit -> repoelipse; repoelipse [label=". . . ."]; gerrit -> vnfsdk; @@ -164,48 +164,73 @@ a jenkins verify job, and/or published release documentation including: //Show example of local reponame instance of component info reponame -> reponamedocsdir; - reponamesm -> reponamedocsdir; + reponamesm -> reponamedocsdir; reponamedocsdir [label="docs"]; - reponamedocsdir -> repnamedocsdirindex; + reponamedocsdir -> repnamedocsdirindex; repnamedocsdirindex [label="index.rst", shape=box]; - //Show detail structure of a portion of doc/docs + //Show detail structure of a portion of doc/docs doc -> docs; - docs -> confpy; + docs -> confpy; confpy [label="conf.py",shape=box]; - docs -> masterindex; + docs -> masterindex; masterindex [label="Master\nindex.rst", shape=box]; docs -> release; - docs -> templates; - docs -> otherdocdocumentelipse; + docs -> templates; + docs -> otherdocdocumentelipse; otherdocdocumentelipse [label="...other\ndocuments"]; docs -> submodules - + masterindex -> releasedocumentindex [style=dashed, label="sphinx\ntoctree\nreference"]; - + //Show submodule linkage to docs directory - submodules -> reponamesm [style=dotted,label="git\nsubmodule\nreference"]; + submodules -> reponamesm [style=dotted,label="git\nsubmodule\nreference"]; reponamesm [label="reponame.git"]; //Example Release document index that references component info provided in other project repo - release -> releasedocumentindex; + release -> releasedocumentindex; releasedocumentindex [label="index.rst", shape=box]; releasedocumentindex -> releaserepolist [style=dashed, label="sphinx\ntoctree\nreference"]; - releaserepolist [label="repolist.rst", shape=box]; + releaserepolist [label="repolist.rst", shape=box]; release -> releaserepolist; releaserepolist -> repnamedocsdirindex [style=dashed, label="sphinx\ntoctree\nreference"]; - + } +About GIT branches +------------------ + +GIT is a powerful tool allowing many actions, but without respecting some rules +the GIT structure can be quickly ugly and unmaintaible. + +Here are some conventions about GIT branches: + - ALWAYS create a local branch to edit or create any file. This local branch + will be considered as a topic in Gerrit and allow contributors to work at the + same time on the same project. + - 1 feature = 1 branch. In the case of documentation, a new chapter or page about + a new code feature can be considered as a 'doc feature' + - 1 bug = 1 branch. In the case of documentation, a correction on an existing + sentence can be considered as a 'doc bug' + - the master branch is considered as "unstable", containing new features that + will converge to a stable situation for the release date. + +The day of the release, the repository owner will create a new branch to +fix the code and documentation. This will represent the 'stable' code of the +release. In this context: + - NEVER push a new feature on a stable branch + - Only bug correction are authorized on a stable branch using cherry pick method + +.. image:: git_branches.png + Creating Restructured Text ========================== Templates and Examples ---------------------- Templates are available that capture the kinds of information -useful for different types of projects and provide some examples of -restructured text. We organize templates in the following way to: help authors -understand relationships between documents; keep the user audience context in mind when writing; +useful for different types of projects and provide some examples of +restructured text. We organize templates in the following way to: help authors +understand relationships between documents; keep the user audience context in mind when writing; and tailor sections for different kinds of projects. **Sections** Represent a certain type of content. A section is **provided** in a repository, to @@ -245,17 +270,17 @@ Collections -In addition to these simple templates and examples +In addition to these simple templates and examples there are many open source projects (e.g. Open Daylight, Open Stack) that are using Sphinx and Readthedocs where you may find examples to start with. Working with project teams we will continue to enhance templates here and -capture frequently asked questions on the developer wiki question +capture frequently asked questions on the developer wiki question topic `documentation `_. Each project should: decide what is relevant content; determine the best way to create/maintain it in a CI/CD process; and work with the documentation team to reference content from the master index and guides. -Consider options including filling in a template, +Consider options including filling in a template, identifying existing content that can be used as is or easily converted, and use of Sphinx directives/extensions to automatically generate restructured text from other source you already have. @@ -399,6 +424,3 @@ Update submodules, build documentation using tox & then open using any browser. firefox docs/_build/html/index.html .. note:: Make sure to run `tox -elocal` and not just `tox`. - - - -- 2.16.6