CPERF: minor fixes to csit

[releng.git] / jjb / cperf / cperf-robot-netvirt-csit.sh

diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh
index 3eed402..2912911 100755 (executable)
--- a/jjb/cperf/cperf-robot-netvirt-csit.sh
+++ b/jjb/cperf/cperf-robot-netvirt-csit.sh
@@ -18,6 +18,7 @@ fi
 
 echo "ODL Branch set: ${ODL_BRANCH} and OS Version is ${FULL_OS_VER}"
 
+sudo rm -rf releng
 git clone https://gerrit.opnfv.org/gerrit/releng.git
 REL_PATH='releng/jjb/cperf'
 
@@ -83,7 +84,7 @@ robot_cmd="pybot \
   -v NUM_TOOLS_SYSTEM:0 \
   -v ODL_SNAT_MODE:conntrack \
   -v ODL_STREAM:$ODL_STREAM \
-  -v ODL_SYSTEM_IP: $CONTROLLER_1_IP \
+  -v ODL_SYSTEM_IP:$CONTROLLER_1_IP \
   -v OS_CONTROL_NODE_IP:$CONTROLLER_1_IP \
   -v OPENSTACK_BRANCH:$FULL_OS_VER \
   -v OS_USER:heat-admin \
@@ -94,7 +95,7 @@ robot_cmd="pybot \
   -v PUBLIC_PHYSICAL_NETWORK:datacentre \
   -v RESTCONFPORT:8081 \
   -v ODL_RESTCONF_USER:admin \
-  -v ODL_RESTCONF_PASSWORD:admin \
+  -v ODL_RESTCONF_PASSWORD:$SDN_CONTROLLER_PASSWORD \
   -v KARAF_PROMPT_LOGIN:'opendaylight-user' \
   -v KARAF_PROMPT:'opendaylight-user.*root.*>' \
   -v SECURITY_GROUP_MODE:stateful \