aboutsummaryrefslogtreecommitdiffstats
path: root/testcases
diff options
context:
space:
mode:
authorManuel Buil <manuel.buil@ericsson.com>2016-07-28 17:02:22 +0200
committerManuel Buil <manuel.buil@ericsson.com>2016-07-28 17:21:42 +0200
commit479ce09a9bd5649435dad5caeb0d7e338bb3affb (patch)
treeffdd3ef7d0c91b36d99fcb2cb38c741d22ced6bb /testcases
parentf80d9312389dc97a570e5fbcde3491080cc9e307 (diff)
Bug fix of the CI script in the ODL-SFC test case
Change-Id: Id3db14d1f26a7dd75cdaaf4d7ca0f54268a89faf Signed-off-by: Manuel Buil <manuel.buil@ericsson.com>
Diffstat (limited to 'testcases')
-rwxr-xr-xtestcases/features/sfc/server_presetup_CI.bash6
-rwxr-xr-xtestcases/features/sfc/set-up-tacker.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/testcases/features/sfc/server_presetup_CI.bash b/testcases/features/sfc/server_presetup_CI.bash
index bc4f3be9..785e7a7f 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 a8582231..3a3656a2 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