diff options
| author |   mbeierl <mark.beierl@dell.com> | 2017-06-29 14:16:39 -0400 |
|---|---|---|
| committer | mbeierl <mark.beierl@dell.com> | 2017-06-30 20:45:58 -0400 |
| commit | 2c95b01efa53c7e7d4ea7d73fde0da6099938e50 (patch) | |
| tree | d8e3a3cbed1d1f7778fd1045fe063dfe29d509e4 /ci/daily.sh | |
| parent | 45130c365c235bc4a5a53fd0ddb15f84a1460199 (diff) | |
Docker Compose Updates
Adds docker-compose directory with content to start container suite using
nginx as front and and SwaggerUI in its own container.
Updates the documentation to reflect new method of starting StorPerf.
Change-Id: I469676e330dcad6c968b90133df8866b69eb5ea1
JIRA: STORPERF-181
Signed-off-by: mbeierl <mark.beierl@dell.com>
Diffstat (limited to 'ci/daily.sh')
| -rwxr-xr-x | ci/daily.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ci/daily.sh b/ci/daily.sh index c42fe64..26d5fea 100755 --- a/ci/daily.sh +++ b/ci/daily.sh @@ -27,8 +27,6 @@ pip install osc_lib==1.3.0 pip install python-openstackclient==3.7.0 pip install python-heatclient==1.7.0 -sudo find $WORKSPACE/ -name '*.db' -exec rm -fv {} \; - $WORKSPACE/ci/generate-admin-rc.sh echo "TEST_DB_URL=http://testresults.opnfv.org/test/api/v1" >> $WORKSPACE/ci/job/admin.rc $WORKSPACE/ci/generate-environment.sh @@ -42,12 +40,12 @@ done < $WORKSPACE/ci/job/admin.rc export AGENT_COUNT=${AGENT_COUNT:-$CINDER_NODES} export BLOCK_SIZES=${BLOCK_SIZES:-1024,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 POD_NAME=${NODE_NAME:-`hostname`} export SCENARIO_NAME=${DEPLOY_SCENARIO:-none} -export STEADY_STATE_SAMPLES=${STEADY_STATE_SAMPLES:-10} export TEST_CASE=${TEST_CASE:-snia_steady_state} export VERSION=`echo ${BUILD_TAG#*daily-} | cut -d- -f1` export VOLUME_SIZE=${VOLUME_SIZE:-2} @@ -58,13 +56,13 @@ echo Environment env | sort echo ========================================================================== +$WORKSPACE/ci/remove_docker_container.sh $WORKSPACE/ci/delete_stack.sh $WORKSPACE/ci/create_glance_image.sh $WORKSPACE/ci/create_storperf_flavor.sh $WORKSPACE/ci/launch_docker_container.sh $WORKSPACE/ci/create_stack.sh $AGENT_COUNT $VOLUME_SIZE "Ubuntu 16.04 x86_64" $NETWORK - export WORKLOAD=_warm_up,$WORKLOADS export BLOCK_SIZE=$BLOCK_SIZES export QUEUE_DEPTH=$QUEUE_DEPTHS @@ -99,7 +97,8 @@ curl -s -X DELETE --header 'Accept: application/json' 'http://127.0.0.1:5000/api curl -s -X GET "http://127.0.0.1:5000/api/v1.0/jobs?id=$JOB&type=metadata" \ -o $WORKSPACE/ci/job/report.json -docker rm -f storperf +$WORKSPACE/ci/remove_docker_container.sh + sudo rm -rf $WORKSPACE/ci/job/carbon echo ========================================================================== |