From 967ee17e64c1aff48339d35cbdc0e317f9e87d70 Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Mon, 25 Jul 2016 12:51:08 +0200 Subject: [PATCH] CSIT-225: use all needed ssh options in bootstrap-vpp-verify-weekly.sh - use needed ssh option in scp, start and stop virl simulation Change-Id: Ia9791877c5f35236358f217fecbf4a5c05dd8cfa Signed-off-by: Jan Gelety --- bootstrap-vpp-verify-weekly.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bootstrap-vpp-verify-weekly.sh b/bootstrap-vpp-verify-weekly.sh index b4a3e8f034..bc85d65248 100644 --- a/bootstrap-vpp-verify-weekly.sh +++ b/bootstrap-vpp-verify-weekly.sh @@ -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 -- 2.16.6