6 files changed, 121 insertions, 22 deletions
diff --git a/docs/ci/index.rst b/docs/ci/index.rst
index 08f23ac2f..445552a82 100644
--- a/docs/ci/index.rst
+++ b/docs/ci/index.rst
@@ -8,10 +8,17 @@
 OPNFV CI
 ========
 
-TBD
+OPNFV continuous integration (CI) is ran on a variety of :doc:`hardware <resources>`
+connected to Jenkins and mangaged through YAML files in the `Releng`_
+repository. These YAML files are read by `Jenkins Job Builder`_ to
+generate and upload Jenkins jobs to the server. See the :doc:`User Guide
+<user-guide>` for resources on getting started with CI for your project.
 
 .. toctree::
    :maxdepth: 2
 
    user-guide
    resources
+
+.. _Releng: https://gerrit.opnfv.org/gerrit/admin/repos/releng
+.. _Jenkins Job Builder: https://docs.openstack.org/infra/jenkins-job-builder/
diff --git a/docs/ci/tables/ci-build-servers.rst b/docs/ci/tables/ci-build-servers.rst
index ad168653e..b2f4893e3 100644
--- a/docs/ci/tables/ci-build-servers.rst
+++ b/docs/ci/tables/ci-build-servers.rst
@@ -18,23 +18,14 @@
      - aarch64
      - Ubuntu 16.04
      - `Armband ENEA Team`_
-   * - `ericsson-build3 <https://build.opnfv.org/ci/computer/ericsson-build3>`_
+   * - `lf-build5 <https://build.opnfv.org/ci/computer/lf-build5>`_
      - x86_64
-     - Ubuntu 16.04
-     - `Dianfeng Du`_
-   * - `ericsson-build4 <https://build.opnfv.org/ci/computer/ericsson-build4>`_
-     - x86_64
-     - Ubuntu 16.04
-     - `Dianfeng Du`_
-   * - `lf-build1 <https://build.opnfv.org/ci/computer/lf-build1>`_
-     - x86_64
-     - CentOS 7.4
+     - Ubuntu 18.04
      - `Linux Foundation`_
-   * - `lf-build2 <https://build.opnfv.org/ci/computer/lf-build2>`_
+   * - `lf-build6 <https://build.opnfv.org/ci/computer/lf-build6>`_
      - x86_64
-     - Ubuntu 16.10
+     - CentOS 8
      - `Linux Foundation`_
 
 .. _Linux Foundation: helpdesk@opnfv.org
-.. _Dianfeng Du: dianfeng.du@ericsson.com
 .. _Armband ENEA Team: armband@enea.com
diff --git a/docs/ci/user-guide.rst b/docs/ci/user-guide.rst
index 9c9b74a41..a56a3a1b0 100644
--- a/docs/ci/user-guide.rst
+++ b/docs/ci/user-guide.rst
@@ -8,4 +8,102 @@
 CI User Guide
 =============
 
-TBD
+Structure of the Releng Repository
+----------------------------------
+
+jjb/<projects>
+   Individual project CI configurations.
+
+jjb/global
+   Collection of JJB defaults and templates shared by all projects.
+
+global-jjb/
+   Git submodule pointing to `Global-JJB`_, which provides a variety of
+   common `CI jobs`_ such as ReadTheDocs
+   (RTD) builds.
+
+docs/
+  This documentation.
+
+releases/
+  Release configuration files for creating stable branches and tagging
+  repositories and related automation scripts.
+
+utils/
+  Collection of common utilities used by projects
+
+utils/build-server-ansible
+  Ansible configuration for managing build servers. This is where
+  projects can add packages they need for their CI to the servers.
+
+
+CI Setup
+--------
+
+Basic Setup
+~~~~~~~~~~~
+
+All projects are required to have a **+1 Verified** vote in Gerrit in
+order to merge their code. As a new project that comes in may not yet
+know how they want to setup CI, they can pass this validation by
+configuring a 'no-op' job to run against their changesets.
+
+1. Clone the `Releng`_ repository, using the *Clone with commit-msg
+   hook* command under the *SSH* tab (displayed after logging in and
+   uploading an SSH key):
+
+   .. note::
+     <gerrit username> in the command below will be your username in
+     Gerrit when viewing the command on the website.
+
+   For example::
+
+     git clone "ssh://<gerrit username>@gerrit.opnfv.org:29418/releng" && \
+     scp -p -P 29418 <gerrit username>@gerrit.opnfv.org:hooks/commit-msg "releng/.git/hooks/"
+
+
+2. Create a project directory under the *jjb/* directory, and an intial
+   project YAML file::
+
+     mkdir jjb/myproject
+     touch jjb/myproject/myproject-ci-jobs.yaml
+
+3. Modify the project YAML file to add the basic validation job::
+
+     $EDITOR jjb/myproject/myproject-ci-jobs.yaml
+
+   ::
+
+     ---
+     - project:
+         name: myproject
+         project:
+           - '{name}'
+         jobs:
+           - '{project}-verify-basic'
+
+Docker Builds
+~~~~~~~~~~~~~
+
+Docker build are managed through the **jjb/releng/opnfv-docker.yaml**
+file. Modify this file with your project details to enable docker builds
+on merges and tags to your project repository::
+
+  ---
+  - project:
+      name: opnfv-docker'
+
+      [...]
+
+      dockerrepo:
+        [...]
+        - 'myproject':
+          project: 'myproject'
+          <<: *master
+
+.. _Jenkins Job Builder: https://docs.openstack.org/infra/jenkins-job-builder/
+.. _Releng: https://gerrit.opnfv.org/gerrit/admin/repos/releng
+.. _Global-JJB: https://docs.releng.linuxfoundation.org/projects/global-jjb/en/latest/index.html
+.. _CI jobs: https://docs.releng.linuxfoundation.org/projects/global-jjb/en/latest/index.html#global-jjb-templates
+.. _opnfvdocs: https://docs.opnfv.org/en/latest/how-to-use-docs/index.html
+.. _support.linuxfoundation.org: https://jira.linuxfoundation.org/plugins/servlet/theme/portal/2/create/145
diff --git a/docs/conf.py b/docs/conf.py
index 86ab8c577..6cfaf6985 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1 +1,10 @@
-from docs_conf.conf import *  # flake8: noqa
+project = 'Releng'
+extensions = [
+    'sphinx.ext.autosectionlabel'
+]
+html_theme = "piccolo_theme"
+autosectionlabel_prefix_document = True
+autosectionlabel_maxdepth = 4
+numfig = True
+numfig_format = {'figure': 'Figure %s', 'table': 'Table %s',
+                 'code-block': 'Listing %s', 'section': 'Section %s'}
diff --git a/docs/conf.yaml b/docs/conf.yaml
deleted file mode 100644
index 749a4b1cf..000000000
--- a/docs/conf.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-project_cfg: opnfv
-project: releng
diff --git a/docs/requirements.txt b/docs/requirements.txt
deleted file mode 100644
index f26b04141..000000000
--- a/docs/requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-lfdocs-conf
-sphinxcontrib-httpdomain
-sphinx-opnfv-theme