Including additional projects, aligning test content.

Change-Id: I0d3569996ca39a3952c248f1fdd8dc8e8c8963be
Signed-off-by: ChristopherPrice <christopher.price@ericsson.com>
(cherry picked from commit b3b1197b82cab346fd39a5e309897705472b3cd4)

4 files changed, 22 insertions, 16 deletions

diff --git a/build-composite.sh b/build-composite.sh
index 714bd5bbc..162e0a217 100755
--- a/build-composite.sh
+++ b/build-composite.sh
@@ -33,6 +33,8 @@ get_repo_names() {
     echo "promise"
     echo "sdnvpn"
     echo "vswitchperf"
+    echo "ovsnfv"
+    echo "compass4nfv"
 }
 
 git_clone() {
diff --git a/docs/configguide/postinstall-functest.rst b/docs/configguide/postinstall-functest.rst
index 1bdced4c4..5c9e03ec3 100644
--- a/docs/configguide/postinstall-functest.rst
+++ b/docs/configguide/postinstall-functest.rst
@@ -1,4 +1,5 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 
+.. include:: ../projects/functest/userguide/introduction.rst
 .. include:: ../projects/functest/configguide/configguide.rst
diff --git a/docs/scenario/scenariomatrix.rst b/docs/scenario/scenariomatrix.rst
index 5769fa8d9..1b42e764f 100644
--- a/docs/scenario/scenariomatrix.rst
+++ b/docs/scenario/scenariomatrix.rst
@@ -4,6 +4,16 @@ scenarios.  While our target is to establish parity across the installation tool
 can provide all scenarios, the practical challenge of achieving that goal for any given feature and
 release results in some disparity.
 
+Brahmaputra scenario overeview
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The following table provides an overview of the installation tools and available scenario's
+in the Brahmaputra release of OPNFV.
+
+.. image:: ../images/brahmaputrascenariomatrix.jpg
+   :alt: OPNFV Brahmaputra Scenario Matrix
+
+
 Scenario Naming
 ^^^^^^^^^^^^^^^
 
@@ -66,12 +76,3 @@ virtual deployments can be found in the installer specific installation instruct
 To set up a Jenkins slave for automated deployment to your lab, refer to the `Jenkins slave connect guide.
 <http://artifacts.opnfv.org/brahmaputra.1.0/docs/opnfv-jenkins-slave-connection.brahmaputra.1.0.html>`_
 
-Brahmaputra scenario overeview
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The following table provides an overview of the installation tools and available scenario's
-in the Brahmaputra release of OPNFV.
-
-.. image:: ../images/brahmaputrascenariomatrix.jpg
-   :alt: OPNFV Brahmaputra Scenario Matrix
-
diff --git a/docs/userguide/test-usage.rst b/docs/userguide/test-usage.rst
index 60b95dda2..1cf6dcaa2 100644
--- a/docs/userguide/test-usage.rst
+++ b/docs/userguide/test-usage.rst
@@ -2,15 +2,17 @@
 .. http://creativecommons.org/licenses/by/4.0
 .. (c) Christopher Price (Ericsson AB)
 
-==================================
-Using the test frameworks in OPNFV
-==================================
+.. deprecated for Brahmaputra
 
-Testing is one of the key activities in OPNFV, validation can include component level testing,
-system testing, automated deployment validation and performance charecteristics testing.
+.. ==================================
+.. Using the test frameworks in OPNFV
+.. ==================================
 
-The following sections outline how to use the test projects delivering automated
-test suites and frameworks in the in the Brahmaputra release of OPNFV.
+.. Testing is one of the key activities in OPNFV, validation can include component level testing,
+.. system testing, automated deployment validation and performance charecteristics testing.
+
+.. The following sections outline how to use the test projects delivering automated
+.. test suites and frameworks in the in the Brahmaputra release of OPNFV.
 
 .. <project>/docs/userguide/testusage.rst files will be imported below by the build script.