From c7806a0f08f6114d8b1f037a77af041a2b0364d5 Mon Sep 17 00:00:00 2001 From: mbeierl Date: Wed, 7 Jun 2017 21:11:55 -0400 Subject: Allow User-Specified Sample Size Adds the ability to accept steady_state_sample_size as a parameter. Removes deprecated nowarm and nossd. Adds OS_PROJECT_DOMAIN_ID. Change-Id: I00c01b05cd2cbf001bc5446faa30f36137350ccf JIRA: STORPERF-139 Signed-off-by: mbeierl --- ci/daily.sh | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'ci') diff --git a/ci/daily.sh b/ci/daily.sh index 10a06c5..21fbc5c 100755 --- a/ci/daily.sh +++ b/ci/daily.sh @@ -14,20 +14,6 @@ then WORKSPACE=`pwd` fi -export AGENT_COUNT=${AGENT_COUNT:-$CINDER_NODES} -export VOLUME_SIZE=${VOLUME_SIZE:-2} -export WORKLOADS=${WORKLOADS:-ws,wr,rs,rr,rw} -export BLOCK_SIZES=${BLOCK_SIZES:-1024,16384} -export QUEUE_DEPTHS=${QUEUE_DEPTHS:-1,4} -export STEADY_STATE_SAMPLES=${STEADY_STATE_SAMPLES:-10} -export DEADLINE=${DEADLINE:-`expr $STEADY_STATE_SAMPLES \* 3`} -export TEST_CASE=${TEST_CASE:-snia_steady_state} -export SCENARIO_NAME=${DEPLOY_SCENARIO:-none} -export DISK_TYPE=${DISK_TYPE:-unspecified} - -# This is set by Jenkins, but if we are running manually, just use the -# current hostname. -export POD_NAME=${NODE_NAME:-`hostname`} git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng $WORKSPACE/ci/job/releng @@ -54,7 +40,18 @@ do export "$env" done < $WORKSPACE/ci/job/admin.rc +export AGENT_COUNT=${AGENT_COUNT:-$CINDER_NODES} +export BLOCK_SIZES=${BLOCK_SIZES:-1024,16384} +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} +export WORKLOADS=${WORKLOADS:-ws,wr,rs,rr,rw} echo ========================================================================== echo Environment -- cgit 1.2.3-korg