From d9aba00385c7890a7436837e0a4ac4d0b81c8a32 Mon Sep 17 00:00:00 2001
From: JingLu5 <lvjing5@huawei.com>
Date: Tue, 25 Jul 2017 09:14:54 +0000
Subject: 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>
---
 tests/ci/scp_storperf_files.sh | 20 +++++++++++---------
 tests/ci/yardstick-verify      |  8 ++++----
 2 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'tests')

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 =========="
 
-- 
cgit 1.2.3-korg