Merge "This patch includes scripts to verify the sha512sum of the guest image. Also...

diff --git a/ci/build_rpm/build_rpms_docker.sh b/ci/build_rpm/build_rpms_docker.sh
index 2670163..59d5bb9 100755 (executable)
--- a/ci/build_rpm/build_rpms_docker.sh
+++ b/ci/build_rpm/build_rpms_docker.sh
@@ -10,7 +10,7 @@ cp -r $rpm_build_dir $tmp_rpm_build_dir
 cd $tmp_rpm_build_dir/qemu
 make clean
 ./configure
-make
+make -j$(nproc)
 cd $tmp_rpm_build_dir
 ./ci/build_rpm/qemu_rpm_build.sh build_output
 

diff --git a/ci/build_rpm/mkspec b/ci/build_rpm/mkspec
index 4aa5423..2f750dc 100755 (executable)
--- a/ci/build_rpm/mkspec
+++ b/ci/build_rpm/mkspec
@@ -27,7 +27,7 @@ echo "%setup -q"
 echo "         "
 echo "%build"
 echo "%_configure"
-echo "make"
+echo "make -j$(nproc)"
 echo "%install"
 echo "rm -rf %{buildroot}"
 echo "make install DESTDIR=%{buildroot}"

diff --git a/docs/installationprocedure/index.rst b/docs/installationprocedure/index.rst
index 00ccaf2..4f9fa69 100644 (file)
--- a/docs/installationprocedure/index.rst
+++ b/docs/installationprocedure/index.rst
@@ -2,11 +2,9 @@
 
 .. http://creativecommons.org/licenses/by/4.0
 
-**********************
-Installation procedure
-**********************
-Colorado 1.0
-------------
+**********************************
+KVMforNFV Installation instruction
+**********************************
 
 .. toctree::
    :numbered:
@@ -14,4 +12,3 @@ Colorado 1.0
 
    abstract.rst
    kvm4nfv-cicd.installation.instruction.rst
-   kvm4nfv-cicd.release.notes.rst

diff --git a/docs/releasenotes/index.rst b/docs/releasenotes/index.rst
index 9ae91bf..7f3e54d 100644 (file)
--- a/docs/releasenotes/index.rst
+++ b/docs/releasenotes/index.rst
@@ -1,9 +1,9 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 
-=========================
-KVM4NFV CICD Release Note
-=========================
+============================================
+KVMFORNFV Release Notes for Colorado Release
+============================================
 
 .. toctree::
    :maxdepth: 2

diff --git a/docs/releasenotes/release-notes.rst b/docs/releasenotes/release-notes.rst
index c6013d2..6da2951 100644 (file)
--- a/docs/releasenotes/release-notes.rst
+++ b/docs/releasenotes/release-notes.rst
@@ -1,10 +1,7 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
-
 .. http://creativecommons.org/licenses/by/4.0
+.. (c) <optionally add copywriters name>
 
-=====================================================
-OPNFV Release Note for "Colorado release" - KVMFORNFV
-=====================================================
 
 .. _Kvmfornfv: https://wiki.opnfv.org/display/kvm/
 
@@ -12,14 +9,7 @@ OPNFV Release Note for "Colorado release" - KVMFORNFV
 Abstract
 ========
 
-This document provides the release notes for Colorado release of KVMFORNFV.
-
-License
-=======
-
-KVMFORNFV is licensed under a Creative Commons Attribution 4.0 International
-License.You should have received a copy of the license along with this. If not,
-see <http://creativecommons.org/licenses/by/4.0/>.
+This document provides the release notes for Colorado 1.0 release of KVMFORNFV.
 
 
 **Contents**
@@ -32,35 +22,40 @@ see <http://creativecommons.org/licenses/by/4.0/>.
 
 4  Delivery Data
 
-5 References
+5  References
 
 1   Version history
 ===================
 
-+--------------------+--------------------+--------------------+--------------------+
-| **Date**           | **Ver.**           | **Author**         | **Comment**        |
-|                    |                    |                    |                    |
-+--------------------+--------------------+--------------------+--------------------+
-|2016-08-22          | 0.1.0              |                    | Colorado release   |
-|                    |                    |                    |                    |
-+--------------------+--------------------+--------------------+--------------------+
++--------------------+--------------------+--------------------+----------------------+
+| **Date**           | **Ver.**           | **Author**         | **Comment**          |
+|                    |                    |                    |                      |
++--------------------+--------------------+--------------------+----------------------+
+|2016-08-22          | 0.1.0              |                    | Colorado 1.0 release |
+|                    |                    |                    |                      |
++--------------------+--------------------+--------------------+----------------------+
 
 2   Important notes
 ===================
 
-The software delivered in the OPNFV KVMFORNFV_ Project, comprises the
-*ci*, the *kvmfornfv test cases*.
-
-The *KVMFORNFV* framework depends on the *Fuel* installer.
-
+The KVMFORNFV project is currently supported on the Fuel installer.
 
 3   Summary
 ===========
 
-This Colorado release provides *KVMFORNFV* as a framework to enhance the
+This Colorado 1.0 release provides *KVMFORNFV* as a framework to enhance the
 KVM Hypervisor for NFV and OPNFV scenario testing, automated in the OPNFV
 CI pipeline, including:
 
+*   KVMFORNFV source code
+
+*   Automation of building the Kernel and qemu for RPM and debian packages
+
+*   Cyclictests execution to check the latency
+
+*   “os-sdn-kvm-ha” Scenario testing for high availability configuration using
+Fuel installer
+
 * Documentation created
 
   * User Guide
@@ -71,19 +66,6 @@ CI pipeline, including:
 
   * Release notes (this document)
 
-* KVMFORNFV source code
-
-* Cyclictests for KVMFORNFV
-
-For Colorado release, the KVMFORNFV uses for the following:
-
-* Automation of building the Kernel and qemu RPM's or debians
-
-* Executing the Cyclictests to check the latency
-
-* os-sdn-kvm-ha Scenario testing for High Availability Configuration using
-  Fuel Installer
-
 The *KVMFORNFV framework* is developed in the OPNFV community, by the
 KVMFORNFV_ team.
 
@@ -100,10 +82,10 @@ KVMFORNFV_ team.
 | **Release designation**              | Colorado                             |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release date**                     | 2016-08-22                           |
+| **Release date**                     | 2016-09-22                           |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Purpose of the delivery**          | OPNFV Colorado Releases              |
+| **Purpose of the delivery**          | OPNFV Colorado 1.0 Releases          |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 
@@ -112,6 +94,16 @@ KVMFORNFV_ team.
 
 4.1.1   Module version changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This is the Colorado 1.0 main release. It is based on following upstream
+versions:
+
+*   RT Kernel 4.4.6-rt14
+
+*   QEMU 2.6
+
+*   Fuel plugin based on Fuel 9.0
+
 This is the first tracked release of KVMFORNFV
 
 
@@ -125,17 +117,6 @@ This is the initial version of the KVMFORNFV framework in OPNFV.
 4.2.1 Feature additions
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-+--------------------------------------+--------------------------------------+
-| **JIRA REFERENCE**                   | **SLOGAN**                           |
-|                                      |                                      |
-+--------------------------------------+--------------------------------------+
-| JIRA:                                | NFV Hypervisors-KVMKVMFORNFV-34      |
-|                                      |                                      |
-+--------------------------------------+--------------------------------------+
-| JIRA:                                | NFV Hypervisors-KVMKVMFORNFV-34      |
-|                                      |                                      |
-+--------------------------------------+--------------------------------------+
-
 4.2.2 Bug corrections
 ~~~~~~~~~~~~~~~~~~~~~
 
@@ -146,7 +127,7 @@ Initial Release
 
 4.3.1   Software deliverables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-KVMFORNFV framework source code <Colorado>
+Colorado 1.0 release of the KVMFORNFV RPM and debian for Fuel.
 
 4.3.2   Documentation deliverables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/docs/scenarios/os-nosdn-kvm-ha/index.rst b/docs/scenarios/os-nosdn-kvm-ha/index.rst
index 0c89bc6..a4d28a2 100755 (executable)
--- a/docs/scenarios/os-nosdn-kvm-ha/index.rst
+++ b/docs/scenarios/os-nosdn-kvm-ha/index.rst
@@ -1,9 +1,9 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 
-==============================
-KVMFORNFV Scenario Description
-==============================
+****************************************
+os-nosdn-kvm-ha Overview and Description
+****************************************
 
 .. toctree::
    :numbered:

diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst
index 55042ec..ae0b380 100644 (file)
--- a/docs/userguide/index.rst
+++ b/docs/userguide/index.rst
@@ -2,11 +2,9 @@
 
 .. http://creativecommons.org/licenses/by/4.0
 
-****************
-OPNFV User Guide
-****************
-Colorado 1.0
-------------
+********************
+KVMforNFV User Guide
+********************
 
 .. toctree::
    :maxdepth: 2