diff options
| -rwxr-xr-x | docker/exec_tests.sh | 2 | ||||
| -rwxr-xr-x | tests/ci/prepare_storperf_admin-rc.sh | 2 | ||||
| -rw-r--r-- | yardstick/resources/scripts/install/storperf.bash | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/docker/exec_tests.sh b/docker/exec_tests.sh index 5f6a945c2..4d81fa045 100755 --- a/docker/exec_tests.sh +++ b/docker/exec_tests.sh @@ -16,7 +16,7 @@ set -e : ${RELENG_REPO:='https://gerrit.opnfv.org/gerrit/releng'} : ${RELENG_REPO_DIR:='/home/opnfv/repos/releng'} -: ${RELENG_BRANCH:='master'} # branch, tag, sha1 or refspec +: ${RELENG_BRANCH:='abbf19f'} # branch, tag, sha1 or refspec # git update using reference as a branch. # git_update_branch ref 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 |