CSIT-225: use all needed ssh options in bootstrap-vpp-verify-weekly.sh 66/2066/2
authorJan Gelety <jgelety@cisco.com>
Mon, 25 Jul 2016 10:51:08 +0000 (12:51 +0200)
committerMatej Klotton <mklotton@cisco.com>
Mon, 25 Jul 2016 11:55:12 +0000 (11:55 +0000)
- use needed ssh option in scp, start and stop virl simulation

Change-Id: Ia9791877c5f35236358f217fecbf4a5c05dd8cfa
Signed-off-by: Jan Gelety <jgelety@cisco.com>
bootstrap-vpp-verify-weekly.sh

index b4a3e8f..bc85d65 100644 (file)
@@ -134,7 +134,7 @@ done
 echo "Updated file names: " ${VPP_DEBS_FULL[@]}
 
 # Copy the files to VIRL host
-scp -i ${VIRL_PKEY} -o StrictHostKeyChecking=no *.deb \
+scp ${SSH_OPTIONS} *.deb \
     ${VIRL_USERNAME}@${VIRL_SERVER}:${VIRL_DIR_LOC}/
 
 result=$?
@@ -148,13 +148,13 @@ fi
 echo "Starting simulation on VIRL server"
 
 function stop_virl_simulation {
-    ssh -i priv_key -o StrictHostKeyChecking=no ${VIRL_USERNAME}@${VIRL_SERVER}\
-        "/home/jenkins-in/testcase-infra/bin/stop-testcase ${VIRL_SID}"
+    ssh ${SSH_OPTIONS} ${VIRL_USERNAME}@${VIRL_SERVER}\
+        "stop-testcase ${VIRL_SID}"
 }
 
-VIRL_SID=$(ssh -i priv_key -o StrictHostKeyChecking=no \
+VIRL_SID=$(ssh ${SSH_OPTIONS} \
     ${VIRL_USERNAME}@${VIRL_SERVER} \
-    "/home/jenkins-in/testcase-infra/bin/start-testcase -c double-ring-nested ${VPP_DEBS_FULL[@]}")
+    "start-testcase -c double-ring-nested ${VPP_DEBS_FULL[@]}")
 retval=$?
 if [ "$?" -ne "0" ]; then
     echo "VIRL simulation start failed"
@@ -173,7 +173,7 @@ echo ${VIRL_SID}
 ssh_do ${VIRL_USERNAME}@${VIRL_SERVER} cat /scratch/${VIRL_SID}/topology.yaml
 
 # Download the topology file from virl session
-scp -i ${VIRL_PKEY} -o StrictHostKeyChecking=no \
+scp ${SSH_OPTIONS} \
     ${VIRL_USERNAME}@${VIRL_SERVER}:/scratch/${VIRL_SID}/topology.yaml \
     topologies/enabled/topology.yaml
 

©2016 FD.io a Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation. Linux is a registered trademark of Linus Torvalds.
Please see our privacy policy and terms of use.