From: Manuel Buil <manuel.buil@ericsson.com>
Date: Thu, 28 Jul 2016 15:02:22 +0000 (+0200)
Subject: Bug fix of the CI script in the ODL-SFC test case
X-Git-Tag: colorado.1.0~183^2~1
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F17733%2F2;p=functest.git

Bug fix of the CI script in the ODL-SFC test case

Change-Id: Id3db14d1f26a7dd75cdaaf4d7ca0f54268a89faf
Signed-off-by: Manuel Buil <manuel.buil@ericsson.com>
---

diff --git a/testcases/features/sfc/server_presetup_CI.bash b/testcases/features/sfc/server_presetup_CI.bash
index bc4f3be9c..785e7a7fc 100755
--- a/testcases/features/sfc/server_presetup_CI.bash
+++ b/testcases/features/sfc/server_presetup_CI.bash
@@ -4,10 +4,10 @@ ssh_options='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
 BASEDIR=`dirname $0`
 INSTALLER_IP=${INSTALLER_IP:-10.20.0.2}
 
-ip=`sshpass -p r00tme ssh $ssh_options root@10.20.0.2 'fuel node'|grep controller|awk '{print $10}' | head -1`
+ip=`sshpass -p r00tme ssh $ssh_options root@${INSTALLER_IP} 'fuel node'|grep controller|awk '{print $10}' | head -1`
 echo $ip
-sshpass -p r00tme scp set-up-tacker.sh ${INSTALLER_IP}:/root
+sshpass -p r00tme scp $ssh_options set-up-tacker.sh ${INSTALLER_IP}:/root
 sshpass -p r00tme ssh $ssh_options root@${INSTALLER_IP} 'scp set-up-tacker.sh '"$ip"':/root'
 sshpass -p r00tme ssh $ssh_options root@${INSTALLER_IP} 'ssh root@'"$ip"' bash set-up-tacker.sh'
 sshpass -p r00tme ssh $ssh_options root@${INSTALLER_IP} 'scp '"$ip"':/root/tackerc .'
-sshpass -p r00tme scp ${INSTALLER_IP}:/root/tackerc $BASEDIR
+sshpass -p r00tme scp $ssh_options ${INSTALLER_IP}:/root/tackerc $BASEDIR
diff --git a/testcases/features/sfc/set-up-tacker.sh b/testcases/features/sfc/set-up-tacker.sh
index a85822311..3a3656a26 100755
--- a/testcases/features/sfc/set-up-tacker.sh
+++ b/testcases/features/sfc/set-up-tacker.sh
@@ -1,4 +1,4 @@
-wget https://gerrit.opnfv.org/gerrit/#/c/15065/5/prototypes/sfc_tacker/poc.tacker-up.sh
+curl "https://gerrit.opnfv.org/gerrit/gitweb?p=fuel.git;a=blob_plain;f=prototypes/sfc_tacker/poc.tacker-up.sh;hb=794427a06b46fddecb76b60c8392e37ae504ab60" > poc.tacker-up.sh
 bash poc.tacker-up.sh
 
 touch delete.sh