Merge branch 'stable/danube' of ssh://gerrit.opnfv.org:29418/storperf into stable/danubedanube.2.0

4 files changed, 126 insertions, 1 deletions

diff --git a/ci/generate-admin-rc.sh b/ci/generate-admin-rc.sh
index 07a0a3e..3c0b33a 100755
--- a/ci/generate-admin-rc.sh
+++ b/ci/generate-admin-rc.sh
@@ -42,5 +42,5 @@ then
     echo export OS_PROJECT_NAME=admin >> job/openstack.rc
 fi
 
-sed "s/export //" job/openstack.rc > job/admin.rc
+grep "export" job/openstack.rc | sed "s/export //"  > job/admin.rc
 echo "INSTALLER_TYPE=${INSTALLER}" >> job/admin.rc
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 69a6e3b..6959095 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -100,6 +100,7 @@ RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${repos_dir}/rele
 
 # Third party git fetches
 RUN git clone https://github.com/swagger-api/swagger-ui.git ${repos_dir}/swagger-ui
+RUN cd ${repos_dir}/swagger-ui && git checkout tags/v2.2.9
 RUN mkdir -p ${repos_dir}/storperf/storperf/resources/html/swagger
 RUN cp -r ${repos_dir}/swagger-ui/dist/* ${repos_dir}/storperf/storperf/resources/html/swagger
 RUN sed -i 's|url = "http://petstore.swagger.io/v2/swagger.json";|url = window.location.protocol+"//"+window.location.host+"/api/spec.json";|' ${repos_dir}/storperf/storperf/resources/html/swagger/index.html
diff --git a/docs/release/release-notes/index.rst b/docs/release/release-notes/index.rst
new file mode 100644
index 0000000..206e941
--- /dev/null
+++ b/docs/release/release-notes/index.rst
@@ -0,0 +1,15 @@
+.. _storperf-releasenotes:
+
+.. This work is licensed under a Creative Commons Attribution 4.0 International
+.. License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) OPNFV, Ericsson AB and others.
+
+======================
+StorPerf Release Notes
+======================
+
+.. toctree::
+   :maxdepth: 2
+
+   release-notes
diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst
new file mode 100644
index 0000000..0ec3cfb
--- /dev/null
+++ b/docs/release/release-notes/release-notes.rst
@@ -0,0 +1,109 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+
+******
+Danube
+******
+
+This document provides the release notes for Danube of StorPerf.
+
+.. contents::
+   :depth: 3
+   :local:
+
+Version history
+===============
+
++--------------------+--------------------+--------------------+--------------------+
+| **Date**           | **Ver.**           | **Author**         | **Comment**        |
+|                    |                    |                    |                    |
++--------------------+--------------------+--------------------+--------------------+
+| 2017-05-04         | Danube 2.0         | Mark Beierl        |                    |
+|                    |                    |                    |                    |
++--------------------+--------------------+--------------------+--------------------+
+| 2017-03-30         | Danube 1.0         | Mark Beierl        |                    |
+|                    |                    |                    |                    |
++--------------------+--------------------+--------------------+--------------------+
+
+
+Summary
+=======
+
+StorPerf is a standalone framework that uses OpenStack to measure Cinder volume
+performance.  If desired, it can push results to the OPNFV Test Results DB, or
+the embedded Graphite web interface can be used to perform ad hoc queries.
+
+Release Data
+============
+
++--------------------------------------+--------------------------------------+
+| **Project**                          | StorPerf                             |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+| **Repo/commit-ID**                   | storperf/danube.2.0                  |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+| **Release designation**              | Danube base release                  |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+| **Release date**                     | 2017-05-04                           |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+| **Purpose of the delivery**          | OPNFV Danube release 2.0             |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+
+Version change
+--------------
+
+Module version changes
+^^^^^^^^^^^^^^^^^^^^^^
+
+No changes to any modules.
+
+Reason for version
+------------------
+
+Features additions
+^^^^^^^^^^^^^^^^^^
+
+None
+
+Bug Fixes
+^^^^^^^^^
+
+The following minor bugs have been fixed
+
+* STORPERF-111
+* STORPERF-123
+* STORPERF-124
+
+See JIRA for full `change log <https://jira.opnfv.org/jira/secure/ReleaseNote.jspa?projectId=11002&version=10713>`_
+
+Deliverables
+------------
+
+Software
+^^^^^^^^
+
+- `StorPerf Docker image <https://hub.docker.com/r/opnfv/storperf/tags>`_ (tag: danube.2.0)
+
+Documentation
+^^^^^^^^^^^^^
+
+- `User Guide <http://docs.opnfv.org/en/stable-danube/submodules/storperf/docs/testing/user/index.html>`_
+
+Known Limitations, Issues and Workarounds
+=========================================
+
+Limitations
+-----------
+
+
+Known issues
+------------
+* STORPERF-56 Cannot delete stack if create failed
+
+Test Result
+===========
+