summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrexlee8776 <limingjiang@huawei.com>2017-06-19 06:53:12 +0000
committerJing Lu <lvjing5@huawei.com>2017-06-22 13:05:18 +0000
commita055421f37b8c25d455c6599484743b6dd0179a4 (patch)
tree866253193f6438cda247b15040a9953de4cfc61e
parent9ae5680998c044bd4d9e39c6dba24ac55c252dd7 (diff)
bugfix: storperf timeout in ci
JIRA: YARDSTICK-680 Change-Id: Ie405187b8ab085a9e4f40a7e7e7e661c94e83630 Signed-off-by: rexlee8776 <limingjiang@huawei.com> (cherry picked from commit 6552d3b7b08c3b9dcaa8f44adc31d5028c00e863)
-rwxr-xr-xtests/ci/prepare_storperf_admin-rc.sh2
-rw-r--r--yardstick/resources/scripts/install/storperf.bash6
2 files changed, 7 insertions, 1 deletions
diff --git a/tests/ci/prepare_storperf_admin-rc.sh b/tests/ci/prepare_storperf_admin-rc.sh
index a6cf97bef..979728e84 100755
--- a/tests/ci/prepare_storperf_admin-rc.sh
+++ b/tests/ci/prepare_storperf_admin-rc.sh
@@ -33,3 +33,5 @@ echo "OS_PROJECT_ID="$PROJECT_ID >> ~/storperf_admin-rc
echo "OS_TENANT_NAME="$TENANT_NAME >> ~/storperf_admin-rc
echo "OS_TENANT_ID="$TENANT_ID >> ~/storperf_admin-rc
echo "OS_USER_DOMAIN_ID="$USER_DOMAIN_ID >> ~/storperf_admin-rc
+echo "OS_PROJECT_DOMAIN_NAME="$OS_PROJECT_DOMAIN_NAME >> ~/storperf_admin-rc
+echo "OS_USER_DOMAIN_NAME="$OS_USER_DOMAIN_NAME >> ~/storperf_admin-rc
diff --git a/yardstick/resources/scripts/install/storperf.bash b/yardstick/resources/scripts/install/storperf.bash
index 9bbec7206..9d20a5a8a 100644
--- a/yardstick/resources/scripts/install/storperf.bash
+++ b/yardstick/resources/scripts/install/storperf.bash
@@ -20,8 +20,12 @@ set -e
mkdir -p /tmp/storperf-yardstick
docker pull opnfv/storperf
+
+STORPERF_DIR=/tmp/storperf-yardstick/carbon
docker run -t \
--env-file ~/storperf_admin-rc \
-p 5000:5000 -p 8000:8000 \
--v /tmp/storperf-yardstick/carbon:/opt/graphite/storage/whisper \
+-v $STORPERF_DIR:/opt/graphite/storage/whisper \
--name storperf-yardstick opnfv/storperf &
+
+chown www-data:www-data $STORPERF_DIR