summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2017-10-13 11:55:27 -0700
committerSofia Wallin <sofia.wallin@ericsson.com>2017-12-15 14:25:20 +0000
commitd942dfd91ec7d0316d1814e16ba14d020f0ae23b (patch)
tree329ffb1bf1c9072df8b5f32ca3ed77ce8a5f3a0d
parentec87158a838dd982277897449c649503af69e922 (diff)
Infrastructure Documentation Structure Updates
Include references to CI documents in the releng repo and provide links for hardware and software infrastructure to pharos and releng respectively. Also include a link to anteater under the security heading. Change-Id: Ie12d40b8b2616b3a3165a5409a5596112962f283 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org> (cherry picked from commit bc7238b2cd35e203fb3a4e71123608b2e7b0d998)
-rw-r--r--docs/infrastructure/ci.rst11
-rw-r--r--docs/infrastructure/overview.rst10
2 files changed, 15 insertions, 6 deletions
diff --git a/docs/infrastructure/ci.rst b/docs/infrastructure/ci.rst
index c779ffcbe..a6323ef76 100644
--- a/docs/infrastructure/ci.rst
+++ b/docs/infrastructure/ci.rst
@@ -4,8 +4,11 @@
.. SPDX-License-Identifier: CC-BY-4.0
.. (c) Open Platform for NFV Project, Inc. and its contributors
-======================
-Continuous Integration
-======================
+===========================
+Continuous Integration - CI
+===========================
-TBD
+Please see the details of CI from the chapters below.
+
+- :ref:`CI Overview <ci-overview>`
+- :ref:`CI User Guide <ci-user-guide>`
diff --git a/docs/infrastructure/overview.rst b/docs/infrastructure/overview.rst
index 1d503f9b3..1bd792000 100644
--- a/docs/infrastructure/overview.rst
+++ b/docs/infrastructure/overview.rst
@@ -41,9 +41,15 @@ TBD
Software Infrastructure
-----------------------
-TBD
+.. toctree::
+ :maxdepth: 1
+
+ ../submodules/releng/docs/infra/index
+
+Security
+--------
.. toctree::
:maxdepth: 1
- ../submodules/releng/docs/sofware-infrastructure-index
+ ../submodules/releng-anteater/docs/index