diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2017-07-25 09:48:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-25 09:48:00 +0000 |
| commit | 3a87a3262b5aefb7231f90a3b3808b947353eca5 (patch) | |
| tree | a6397bd5448613f19e415ddedd97bbe57153d9ff /tests | |
| parent | f6a24134a515f419090bfd73663a9b1620964123 (diff) | |
| parent | d9aba00385c7890a7436837e0a4ac4d0b81c8a32 (diff) | |
Merge "update storperf installation in Yardstick"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ci/scp_storperf_files.sh | 20 | ||||
| -rwxr-xr-x | tests/ci/yardstick-verify | 8 |
2 files changed, 15 insertions, 13 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 diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify index 751cf65f3..149eef429 100755 --- a/tests/ci/yardstick-verify +++ b/tests/ci/yardstick-verify @@ -99,8 +99,8 @@ set -o pipefail install_storperf() { - # Install Storper on huawei-pod1 - if [ "$INSTALLER_TYPE" == "compass" ]; then + # Install Storper on huawei-pod1 and huawei-pod2 + if [ "$NODE_NAME" == "huawei-pod1" -o "$NODE_NAME" == "huawei-pod2" ]; then echo echo "========== Installing storperf ==========" @@ -114,8 +114,8 @@ install_storperf() remove_storperf() { - # remove Storper from huawei-pod1 - if [ "$INSTALLER_TYPE" == "compass" ]; then + # remove Storper from huawei-pod1 and huawei-pod2 + if [ "$NODE_NAME" == "huawei-pod1" -o "$NODE_NAME" == "huawei-pod2" ]; then echo echo "========== Removing storperf ==========" |