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>
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
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'
case "$NODE_NAME" in
"huawei-pod1")
JUMP_HOST_IP='192.168.10.6'
;;
"huawei-pod2")
JUMP_HOST_IP='192.168.11.2'
;;
"huawei-pod2")
JUMP_HOST_IP='192.168.11.2'
;;
*)
# no node name, exit
;;
*)
# no node name, exit
+ echo "storperf test case will not run on this pod, skipping 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
-sshpass -p root scp 2>/dev/null $ssh_options /home/opnfv/repos/storperf/docker-compose/nginx.conf \
- root@${JUMP_HOST_IP}:/root/ &> /dev/null
- # 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 =========="
echo
echo "========== Installing 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 =========="
echo
echo "========== Removing storperf =========="