From c420248ac1daed625ab0d05d1a663c877426701a Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Wed, 2 Aug 2017 11:24:27 +0800 Subject: Fix bug in running storperf.sh when WORKSPACE is defined When working directory changes, the script and default configuration will not be found. Change-Id: Iab6e4f9b014c12a863498de42553b043357aa876 Signed-off-by: Yujun Zhang --- integration/storperf/storperf.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'integration/storperf/storperf.sh') diff --git a/integration/storperf/storperf.sh b/integration/storperf/storperf.sh index 8120cb90..31e059d7 100755 --- a/integration/storperf/storperf.sh +++ b/integration/storperf/storperf.sh @@ -28,6 +28,9 @@ while getopts ":t:i:s:j:he" optchar; do esac done +# See https://stackoverflow.com/questions/59895/getting-the-source-directory-of-a-bash-script-from-within +script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + if [[ -z $WORKSPACE ]];then WORKSPACE=`pwd` fi @@ -35,11 +38,11 @@ fi #set vars from env if not provided by user as options installer_type=${installer_type:-$INSTALLER_TYPE} installer_ip=${installer_ip:-$INSTALLER_IP} -stack_json=${stack_json:-"$WORKSPACE/default_stack.json"} -job_json=${job_json:-"$WORKSPACE/default_job.json"} +stack_json=${stack_json:-"$script_dir/default_stack.json"} +job_json=${job_json:-"$script_dir/default_job.json"} -source $WORKSPACE/openstack.sh -source $WORKSPACE/storperf_docker.sh +source $script_dir/openstack.sh +source $script_dir/storperf_docker.sh git clone --depth 1 https://gerrit.opnfv.org/gerrit/storperf $WORKSPACE/storperf git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng $WORKSPACE/releng @@ -47,7 +50,7 @@ git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng $WORKSPACE/releng virtualenv $WORKSPACE/storperf_venv source $WORKSPACE/storperf_venv/bin/activate -pip install -r ./storperf_requirements.txt +pip install -r $script_dir/storperf_requirements.txt $WORKSPACE/releng/utils/fetch_os_creds.sh -i ${installer_type} -a ${installer_ip} -d $WORKSPACE/openrc source $WORKSPACE/openrc @@ -67,14 +70,13 @@ load_ubuntu_image create_storperf_flavor cd $WORKSPACE/storperf/docker -cp $WORKSPACE/storperf-docker-compose.yaml ./ +cp $script_dir/storperf-docker-compose.yaml ./ echo "Clean existing storperf containers" clean_storperf_container echo "Launch new storperf containers" launch_storperf_container -cd $WORKSPACE -./start_job.sh -s $stack_json -j $job_json +$script_dir/start_job.sh -s $stack_json -j $job_json echo "Clean up environment" cd $WORKSPACE/storperf/docker -- cgit 1.2.3-korg