diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2017-07-10 02:20:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-10 02:20:39 +0000 |
| commit | dae41a002f756d1da65a749bc82eef3ccf4252db (patch) | |
| tree | 6931d3e40b5d059953ae9f951b7070eeff59fa19 /tests/ci | |
| parent | 41136dafb30d0c410e92f9f7a7c19eae60f224e2 (diff) | |
| parent | 3ef4228a89aeb6b3814f0b5ef89c75acfa7f382d (diff) | |
Merge "Yardstick install storperf update"
Diffstat (limited to 'tests/ci')
| -rwxr-xr-x | tests/ci/prepare_env.sh | 2 | ||||
| -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 |