diff options
| author |   JingLu5 <lvjing5@huawei.com> | 2017-07-25 09:14:54 +0000 |
|---|---|---|
| committer | JingLu5 <lvjing5@huawei.com> | 2017-07-25 09:22:06 +0000 |
| commit | d9aba00385c7890a7436837e0a4ac4d0b81c8a32 (patch) | |
| tree | 7035dc19fef412464f813211bcc3d59fe34754e4 /tests/ci/scp_storperf_files.sh | |
| parent | d29df23ae5057fe0ccded6f8d8f3e36a084a78b3 (diff) | |
update storperf installation in Yardstick
Storper has updated its installaion step.
The former used "nginx.conf" is not required any more.
Change-Id: I9edd57ae7cffd3a95990844e6b775616d09132f1
Signed-off-by: JingLu5 <lvjing5@huawei.com>
Diffstat (limited to 'tests/ci/scp_storperf_files.sh')
| -rw-r--r-- | tests/ci/scp_storperf_files.sh | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/tests/ci/scp_storperf_files.sh b/tests/ci/scp_storperf_files.sh index ffcc710cb..71306eb80 100644 --- a/tests/ci/scp_storperf_files.sh +++ b/tests/ci/scp_storperf_files.sh @@ -13,23 +13,25 @@ ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" +scp_files(){ + export JUMP_HOST_IP + sshpass -p root scp 2>/dev/null $ssh_options ~/storperf_admin-rc \ + root@${JUMP_HOST_IP}:/root/ &> /dev/null + sshpass -p root scp 2>/dev/null $ssh_options /home/opnfv/repos/storperf/docker-compose/docker-compose.yaml \ + root@${JUMP_HOST_IP}:/root/ &> /dev/null +} + case "$NODE_NAME" in "huawei-pod1") JUMP_HOST_IP='192.168.10.6' + scp_files ;; "huawei-pod2") JUMP_HOST_IP='192.168.11.2' + scp_files ;; *) # no node name, exit - exit 1 + echo "storperf test case will not run on this pod, skipping scp files..." ;; esac -export JUMP_HOST_IP - -sshpass -p root scp 2>/dev/null $ssh_options ~/storperf_admin-rc \ - root@${JUMP_HOST_IP}:/root/ &> /dev/null -sshpass -p root scp 2>/dev/null $ssh_options /home/opnfv/repos/storperf/docker-compose/docker-compose.yaml \ - root@${JUMP_HOST_IP}:/root/ &> /dev/null -sshpass -p root scp 2>/dev/null $ssh_options /home/opnfv/repos/storperf/docker-compose/nginx.conf \ - root@${JUMP_HOST_IP}:/root/ &> /dev/null |