summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJingLu5 <lvjing5@huawei.com>2017-07-05 03:49:32 +0000
committerJingLu5 <lvjing5@huawei.com>2017-07-07 01:32:12 +0000
commit3ef4228a89aeb6b3814f0b5ef89c75acfa7f382d (patch)
tree14c58fc44e1f25fa6350acab2cc9822db4ab1771 /tests
parentffe83c920736716f0caea36dceeff7b7e910db7c (diff)
Yardstick install storperf update
JIRA: YARDSTICK-702 Sicnce StorPerf has switched to use docker-compose to start container suite. The way Yardstick install storperf should also be updated. Change-Id: Idee05703b8ae5cd03bc214f598f56c8ac05ca755 Signed-off-by: JingLu5 <lvjing5@huawei.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/ci/prepare_env.sh2
-rw-r--r--tests/ci/scp_storperf_files.sh (renamed from tests/ci/scp_storperf_admin-rc.sh)4
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh
index e8f287bcd..3d9cc298f 100755
--- a/tests/ci/prepare_env.sh
+++ b/tests/ci/prepare_env.sh
@@ -63,7 +63,7 @@ $YARDSTICK_REPO_DIR/tests/ci/prepare_storperf_admin-rc.sh
# copy a admin-rc file for StorPerf integration to the deployment location
if [ "$NODE_NAME" == "huawei-pod1" ]; then
- bash $YARDSTICK_REPO_DIR/tests/ci/scp_storperf_admin-rc.sh
+ bash $YARDSTICK_REPO_DIR/tests/ci/scp_storperf_files.sh
fi
# Fetching id_rsa file from jump_server..."
diff --git a/tests/ci/scp_storperf_admin-rc.sh b/tests/ci/scp_storperf_files.sh
index 7c3896d88..f8dce7107 100644
--- a/tests/ci/scp_storperf_admin-rc.sh
+++ b/tests/ci/scp_storperf_files.sh
@@ -14,3 +14,7 @@
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
sshpass -p root scp 2>/dev/null $ssh_options ~/storperf_admin-rc \
root@192.168.200.1:/root/ &> /dev/null
+sshpass -p root scp 2>/dev/null $ssh_options /home/opnfv/repos/storperf/docker-compose/docker-compose.yaml \
+ root@192.168.200.1:/root/ &> /dev/null
+sshpass -p root scp 2>/dev/null $ssh_options /home/opnfv/repos/storperf/docker-compose/nginx.conf \
+ root@192.168.200.1:/root/ &> /dev/null