diff options
| -rwxr-xr-x | ci/daily.sh | 6 | ||||
| -rwxr-xr-x | ci/launch_docker_container.sh | 16 | ||||
| -rw-r--r-- | docker-compose/create-compose.py | 1 | ||||
| -rw-r--r-- | docker-compose/docker-compose.yaml | 1 | ||||
| -rw-r--r-- | docker/storperf-reporting/src/app.py | 10 | ||||
| -rw-r--r-- | docs/index.rst | 6 | ||||
| -rwxr-xr-x | docs/testing/user/installation.rst | 3 |
7 files changed, 27 insertions, 16 deletions
diff --git a/ci/daily.sh b/ci/daily.sh index 526df68..6548cb0 100755 --- a/ci/daily.sh +++ b/ci/daily.sh @@ -45,17 +45,17 @@ do done < $WORKSPACE/ci/job/admin.rc export AGENT_COUNT=${AGENT_COUNT:-$CINDER_NODES} -export BLOCK_SIZES=${BLOCK_SIZES:-1024,16384} +export BLOCK_SIZES=${BLOCK_SIZES:-16384} export STEADY_STATE_SAMPLES=${STEADY_STATE_SAMPLES:-10} export DEADLINE=${DEADLINE:-`expr $STEADY_STATE_SAMPLES \* 3`} export DISK_TYPE=${DISK_TYPE:-unspecified} -export QUEUE_DEPTHS=${QUEUE_DEPTHS:-1,4} +export QUEUE_DEPTHS=${QUEUE_DEPTHS:-4} export POD_NAME=${NODE_NAME:-`hostname`} export SCENARIO_NAME=${DEPLOY_SCENARIO:-none} export TEST_CASE=${TEST_CASE:-snia_steady_state} export VERSION=`echo ${BUILD_TAG#*daily-} | cut -d- -f1` export VOLUME_SIZE=${VOLUME_SIZE:-2} -export WORKLOADS=${WORKLOADS:-ws,wr,rs,rr,rw} +export WORKLOADS=${WORKLOADS:-ws,rs,rw} echo ========================================================================== echo Environment diff --git a/ci/launch_docker_container.sh b/ci/launch_docker_container.sh index 949bf9d..2411ce0 100755 --- a/ci/launch_docker_container.sh +++ b/ci/launch_docker_container.sh @@ -11,7 +11,7 @@ cd `dirname $0` ci=`pwd` -cd ${ci}/../docker +cd ${ci}/../docker-compose export ENV_FILE=${ci}/job/admin.rc export CARBON_DIR=${ci}/job/carbon/ @@ -19,18 +19,24 @@ export CARBON_DIR=${ci}/job/carbon/ if [ ! -d ${ci}/job/carbon ] then mkdir ${ci}/job/carbon - sudo chown 33:33 ${ci}/job/carbon fi -if [ -z $ARCH ] +if [ -z ${ARCH} ] then ARCH=x86_64 fi export ARCH -docker-compose -f local-docker-compose.yaml build -docker-compose -f local-docker-compose.yaml up -d +if [ -z ${DOCKER_TAG} ] +then + DOCKER_TAG=latest +fi + +export TAG=${DOCKER_TAG} + +docker-compose pull +docker-compose up -d echo "Waiting for StorPerf to become active" diff --git a/docker-compose/create-compose.py b/docker-compose/create-compose.py index 2f3be4f..1a63336 100644 --- a/docker-compose/create-compose.py +++ b/docker-compose/create-compose.py @@ -25,6 +25,7 @@ services: storperf-master: container_name: "storperf-master" image: "opnfv/storperf-master:{storperf_tag}" + env_file: {ENV_FILE} links: - storperf-graphite diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index 49ab9e2..734fb5b 100644 --- a/docker-compose/docker-compose.yaml +++ b/docker-compose/docker-compose.yaml @@ -12,6 +12,7 @@ services: storperf-master: container_name: "storperf-master" image: "opnfv/storperf-master:${TAG}" + env_file: ${ENV_FILE} links: - storperf-graphite diff --git a/docker/storperf-reporting/src/app.py b/docker/storperf-reporting/src/app.py index e2d889d..46318ca 100644 --- a/docker/storperf-reporting/src/app.py +++ b/docker/storperf-reporting/src/app.py @@ -30,13 +30,13 @@ def get_data(data): details = temp[0].get('details') metrics = details.get('metrics') report_data = details.get('report_data') - return "single", metrics, report_data + return "single", metrics, report_data, temp else: return "multi", temp else: metrics = temp.get('metrics') report_data = temp.get('report_data') - return "single", metrics, report_data + return "single", metrics, report_data, temp @app.route('/reporting/success/') @@ -65,8 +65,10 @@ def success(): response = get_data(data) if response[0] == "single": metrics, report_data = response[1], response[2] - return render_template('plot_tables.html', - metrics=metrics, report_data=report_data) + results = response[3] + return render_template('plot_multi_data.html', + metrics=metrics, report_data=report_data, + results=results) else: return render_template('plot_multi_data.html', results=response[1]) diff --git a/docs/index.rst b/docs/index.rst index 93bf62e..9729a44 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -23,7 +23,7 @@ StorPerf Installation Guide :maxdepth: 5 :numbered: 5 - ./user/installation.rst + ./testing/user/installation.rst ****************************** StorPerf User Guide @@ -34,8 +34,8 @@ StorPerf User Guide :maxdepth: 5 :numbered: 5 - ./user/introduction.rst - ./user/test-usage.rst + ./testing/user/introduction.rst + ./testing/user/test-usage.rst Indices diff --git a/docs/testing/user/installation.rst b/docs/testing/user/installation.rst index f6c9744..d593e6f 100755 --- a/docs/testing/user/installation.rst +++ b/docs/testing/user/installation.rst @@ -110,8 +110,9 @@ The following ports are exposed if you use the supplied docker-compose.yaml file: * 5000 for StorPerf ReST API and Swagger UI -* 8000 for StorPerf's Graphite Web Server +Note: Port 8000 is no longer exposed and graphite can be accesed via +http://storperf:5000/graphite Running StorPerf Container ========================== |